Updates
Merge branch 'master' of https://github.com/Mjolken/Mjolken

Conflicts:
	assets/css/style.less