Merge branch 'nathan-dev' into richmond-dev
merging in nathan and aarons latest changes
badges view created
Merge branch 'test-merge' into nathan-dev
view checkins page styled
general styling and updated index info container
nearby checkins page styled
badges page general styling done
media query adjusted on list all completed checkins page
wiki api working - home page redirect when already logged in working - locations socrata call now strips out numbers for consitency
Merge branch 'nathan-dev' into richmond-dev
merging in nathan's latest styling changes
create quest map connection completed/map filter added to create quest page
compiling button styling
Merge branch 'nathan-dev' into aaron-dev
implemented view quest tabs
added badges directory to user model
fixed password min length patter attribut
dashboard badge edit
styling checkins list
Merge branch 'nathan-dev' into aaron-dev

Conflicts:
	app/less/app.less
adding compiled es6 files