Merge branch 'richmond-dev' into nathan-dev

Conflicts:
	app/views/shared/template.jade
	app/views/users/checkIn.jade
corrected group removal - removed groupId from groupId array in associated quests
adding photo in create-quest/adding groups no longer required
add quest-placeholder image, removed old user image directories
quests/edit image and add-group added to view - functionality under construction
update quest - change image/add groups functionality added

* made adjustment to both update quest and create quest. quest id is now
added to users when group is added to quest w/o duplication
update quest - isPrivate functionality added
flash message - group confirmation login
user joining group - register and login routes expanded
Merge branch 'richmond-dev' into nathan-dev

Conflicts:
	app/routes/quests.js
	app/views/shared/template.jade
	app/views/users/checkIn.jade
	app/views/users/profile.jade
nearby checkIns page created and functional

* user update photo function needs to be fixed
update user photo fully functional
testing reverted file
update quest photo fixed - removing old file.

* need to apply same fix to update user photo
fixed update user photo - removing old file
Merge branch 'nathan-dev' into richmond-dev
merging with nathan to get in edit profile and quest photos
added time to english conversion to profile checkins page