Merge branch 'cure-master'
admin panel: Fix usage of "abort"
client: Remove unused sys import
database: Remove unused import datetime
publisher: Remove unused sys import
admin: Remove unused sys import
tests: Wait 10 seconds for services to start
Merge remote-tracking branch 'origin/lint'
Merge branch 'master' of github.com:cure/osmo into cure-master
Merge branch 'cure-master'
Merge remote-tracking branch 'chris/master'

Conflicts:
	osmo/admin.py