Merge branch 't63_json_params' into staging
Merge branch 't51_registration' into staging

Conflicts:
	p2psafety_django/events/api/resources.py
	p2psafety_django/requirements.txt
Fixed merge
Trying to fix PYTHONPATH issue
Dummy commit
ticket:63 Merged t63 into staging
ticket:63 Merge branch 't63_json_params' into staging
ticket:52 Merged t52 to staging
ticket:00 merged master into staging
ticket:68 Merge branch 't68_map_fixes' into staging
ticket:35 Merged master into staging
ticket:35 dummy commit
Merge branch 't55_user_movement_type' into staging
ticket:55 Merge branch 'master' into staging
ticket:59 Merge branch 't59_event_update' into staging
Merge branch 'master' into staging
ticket:71 Renamed view
ticket:71 Added tests for 'close_event' view
ticket:71 Implemented 'close_event' view
ticket:71 Added ability to close events manually