ticket:00 Merge branch 'master' into production
ticket:00 Merge branch 'master' into production
ticket:00 Merge branch 'master' into production
ticket:47 Merge branch 'master' into production
ticket:47, 42 Merge branch 'master' into production
ticket:00 Merge branch 'master' into production
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:00 Merge branch 'master' into production
ticket:63 Merge branch 't63_json_params' into staging
ticket:00 Merge branch 'master' into production
ticket:59 some code but not work
ticket:65 small clean up
ticket:65 Another clean up
ticket:52 Merged t52 to staging
ticket:59 add in update support