misc
Merge branch 'redmine2' of github.com:descala/haltr into redmine2

Conflicts:
	assets/stylesheets/haltr.css