stat maps added
Merge branch 'feature-map' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	db/development.sqlite3