template refactoring
Merge branch 'master' of https://github.com/nwlunatic/vmmaster-frontend

Conflicts:
	templates/session/log_step.html
	templates/session/session.html