Correcting indentation
Merge branch 'master' of github.com:mnjuhn/via-ui

Conflicts:
	src/main/webapp/app/css/style.css