corrections
Merge remote-tracking branch 'origin/master'

Conflicts:
	kuerteil/less/kuerteil.less
	kuerteil/resources/css/main.min.css
corrections