plop
Merge branch 'master' of ssh://github.com/fliphess/PushMon-Django

Conflicts:
	app/views.py
	templates/pages/hostdata.html