test buildbot
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/Proteus-tech/eidos_event

Conflicts:
	event/tests/test_views.py