Lot of stuff
Merge branch 'master' of github.com:meako689/save-the-princess

Conflicts:
	server/public/js/controllers/male/currentChallengeCtrl.js