media handling: profile picture and resume
merge
Merge branch 'master' of https://github.com/rococori/we-connect

Conflicts:
	app/constants.js
	app/public/stylesheets/style.css