Changed building management interface
Template fix for guard rape
A whole lot more bugfixes
Merge branch 'dev'

Conflicts:
	index.html
Missing image file
Merge branch 'dev'