Von/Bis
Merge branch 'master' of https://github.com/lgaechter/sbb

Conflicts:
	css/style.css
	js/app/templates/header.html
	scss/_main.scss