wip still cant not save a challenge with duration of 1 hour
error handling on aborted file uploads appirio-tech/lc1-project#467
code review cleanup
Merge branch '467_fileupload_aborted' into TC-2014-12-18
add missing /
Merge branch 'link-fix' into TC-2014-12-18
remove leading slash
Merge branch 'file-upload-fix' into TC-2014-12-18
removed debug
Merge branch 'file-upload-fix' into TC-2014-12-18
Merge branch 'dev' into TC-2014-12-18
wercker deploy
lock down angular version
Merge branch 'fixes' into TC-2014-12-18
Merge branch 'TC-2014-12-18' of https://github.com/appirio-tech/lc1-challenge-app into TC-2014-12-18
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
removed console from edit app.  appirio-tech/lc1-project#479 used $log Provider instead
work in progress
Merge branch 'durationHoursFilter' into 457_launchLessThanDay
re-order dependencies
Merge branch '479_AngularLogging' into TC-2014-12-18