inline
events
Merge branch 'master' of https://github.com/wdfn/pih-django2

Conflicts:
	pih/__init__.pyc
	pih/settings.pyc
	pih/urls.pyc
	pih/views.pyc
	pih/wsgi.pyc