ticket:55 Added movement type model
ticket:55 Added factory and resource for MovementType
ticket:55 Fixed MovementTypeFactory
ticket:55 Added migration for MovementType
ticket:55 Added MovementTypeResource
ticket:35 Fixed tests
ticket:35 Implemented TODOs
ticket:35 Added additional permissions tests
Merge branch 'master' into t55_user_movement_type

Conflicts:
	p2psafety_django/events/tests/test_api/test_resources_http.py
	p2psafety_django/p2psafety/urls.py
	p2psafety_django/users/api/resources.py
	p2psafety_django/users/utils.py
ticket:35 Merge branch 'production'
ticket:55 android adapted to changes
ticket:55 Merged master into t55
ticket:55 Merge branch 't55_user_movement_type'
ticket:68 Merge branch 'master' into t68_map_fixes
ticket:68 Changed permissions to access updates od related events
ticket:68 typo fix
ticket:68 Made notifications to be sent only when event becomes active
ticket:68 Merge branch 't68_map_fixes'
ticket:68 Merge branch 'master' into production