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:59 some code but not work
ticket:52 Merged t52 to staging
ticket:59 add in update support
ticket:59 fix test and add url for event
ticket:59 Merge branch 'master'
ticket:59 fix js
ticket:59 show url
ticket:59 Merge branch 'master'
ticket:59 fix marge problem
ticket:59 fix js bag
ticket:00 merged master into staging
ticket:58 add operator alert and new logout
ticket:58 add migrate