Rubrieken
Merge branch 'master' of ssh://git@github.com/MKBid/BrancheNieuws.git

Conflicts:
	static/sass/_content.scss
	static/sass/_featured.scss
	static/sass/_index.scss
	static/sass/style.scss
	views/smarty/templates/news/index.tpl
Fix index.tpl