update
Merge branch 'master' of https://github.com/epha/verlauf

Conflicts:
	style/awesome/css/font-awesome.css