wercker deploy
Merge branch 'master' of heroku.com:dev-lc1-challenge-app into TC-2014-12-18

Conflicts:
	client/bower.json
	client/manage-challenge/challenge-list/challenge-list.controller.js
	client/manage-challenge/submissions/submissions.html
	server/routes/s3UploadMiddleware.js