Merge branch 'master' into badams
updating badge controller to reference view in load order object
adding photo submission
updated variables
Merge branch 'master' into badams

Conflicts:
	controllers/controllersBadges.js
updating view variables
Merge branch 'badams'