Update React to 15.5 and use prop-types
#1680

jseppi wants to merge update-react into develop

We do not currently have an analysis of these two commits