added search results tabs
Merge branch 'nathan-dev' into aaron-dev

Conflicts:
	app/less/app.less
edit profile pic functionality
Merge branch 'aaron-dev' into nathan-dev
Merge branch 'nathan-dev' into aaron-dev
working on search results lists
Merge branch 'richmond-dev' into aaron-dev

Conflicts:
	app/static/js/es6/compiled/locations.js
	app/static/js/es6/locations.es6.js
updated marker sizes
active quest status on profile
small style edits on profile
view quest details page styled - map working
Merge branch 'aaron-dev' into nathan-dev
Merge branch 'richmond-dev' into nathan-dev
fixed searchbar phone input bug
corrected searchbar bug fix
updated nearby checkin list styling
search results styled
find quests page updated
updated search results jade
merge with nathan