Latest changes
latest changes
Merge branch 'master' of https://github.com/horsensbib/infoscreen

Conflicts:
	content.php
	inc/metabox-layout.php
	infoscreen.css
	sass/_layout.scss