Bump react version to 0.12.0, remove React.DOM comments
update coffee-reactify (0.5.2 -> 2.0.0)
replace react/lib/merge with lodash.merge

react/lib/merge to be depricated after 0.12.0
Remove transferPropsTo from markdown editor
remove transferPropsTo in InPlaceForm
add polyfill for Object.assign, use it on loading indicator
Use spread syntax in svg-image and line graph

replaces #transferPropsTo
Convert lib/link to cjsx
Change #renderComponent calls to just #render

0.12.0 update
Fix object.assign polyfill condition

add lodash.merge to package.json
Update route to new syntax
Merge branch 'master' into update-react-0.12.0

Conflicts:
	app/classifier/drawing-tools/ellipse.cjsx
	app/classifier/drawing-tools/point.cjsx
	app/mock-data/users.coffee
Fix merge
Convert markdown.coffee to cjsx
Post-merge mock data fix

revert to state in #23
Merge branch 'master' into gulp-webpack
Tweaking build process and removing gulp
Remove method prop from in-place-form
Merge pull request #25 from zooniverse/update-react-0.12.0

Update react 0.12.0
Merge branch 'master' into gulp-webpack

Conflicts:
	.gitignore