fix 7
fix 7
fix 8
fix 9
stat maps added
Merge branch 'feature-map' into develop
fix 10
Merge branch 'master' into develop
fix for heroku
fix interface bugs
Merge branch 'master' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	db/development.sqlite3
fix gems for dev branch
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Gemfile
fix interface bugs
Merge branch 'develop'
fix interface bugs
Merge branch 'feature-interface2' into develop
Merge branch 'develop'
fix interface bugs