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

Conflicts:
	templates/base/page.html
	templates/pages/hostdata.html
fix last merge hell