Merge branch 'nathan-dev' into aaron-dev
calculating user points added/check for complete quest

* complete quest confirmation page added
* badges need to be incorporated next into scoring system
calculating user points and badge system added

* needs more troubleshooting
finessed build quest page
Merge branch 'nathan-dev' into aaron-dev

Conflicts:
	app/views/groups/create-group.jade
	app/views/groups/edit.jade
	app/views/groups/view.jade
	app/views/quests/create-quest.jade
leaders page added - finding overall leaders and & group leaders

* page needs to be styled
Merge branch 'aaron-dev' into nathan-dev
fixed minor JS glitch on create quest page
merge conflict with aaron-dev resolved
edit quest page bug fixed
Merge branch 'nathan-dev' into richmond-dev
merging in nathan and aarons latest changes
wiki api working - home page redirect when already logged in working - locations socrata call now strips out numbers for consitency