templates / navbar
clean up structure
clean up again
Merge branch 'master' of https://github.com/EQPolar/smpd

Conflicts:
	app/__init__.py
	views.py