Merge branch 'hotfix/map_time_nil_bug'
Merge branch 'release/0.9.4'
Added active status to Users and bulk action to inactivate users. Some tasts are missing...
Merge branch 'release/0.9.5'
Renamed from 'Mapas' to 'Mapa'
Merge branch 'hotfix/rename_map' into develop
schema file
minor typo in map tests
Changes schema
schema
Merge from develop. User model with activation.
Added .txt output file to merge mail export.