ticket:26 Another try with newer version of factory_boy
ticket:26 Another try to fix setuptools version
ticket:26 Turns out you can not leave a comment in requirements.txt
ticket:26 Small fixes
ticket:26 Added simple LOGGING to settings
ticket:26 Added logging for user creation
ticket:26 fix for psa app
ticket:26 Fixed empty user's full name
ticket:26 Fixed time filter
Merge pull request #2 from 42cc/t26_event_map

T26 event map
Merge branch 'master' into t24_users_resource

Conflicts:
	p2psafety_django/events/tests/helpers.py
	p2psafety_django/events/tests/test_api.py
	p2psafety_django/events/views.py
	p2psafety_django/p2psafety/settings/django.py
	p2psafety_django/requirements.txt
ticket:24 Moved django related files to server part subdir