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
map markers appear to be fixed

* adjusted 'scaledSize' in locations.js for both checkInMarker and questIcon
leaders view styled and javascript functional
class and quest confirmation pages styled

* class-quest-confirmation page under construction
Merge branch 'aaron-dev' into nathan-dev

Conflicts:
	app/static/js/es6/compiled/locations.js
	app/static/js/es6/locations.es6.js
class-quest-confirmation page initial styling
Merge branch 'richmond-dev' into nathan-dev
added search results tabs