Stuff!
Merge branch 'master' of github.com:johandahlgren/JohanMDahlgren

Conflicts:
	components/news.php
	components/page.php
	style/style.css
	style/style.css.map
	style/style.less
Fixar ihop grejerna igen.