Merge branch 'master' of github.com:hermanbanken/wp-theme-excelsior

Conflicts:
	assets/css/app.css
	assets/css/less/app.less
	functions.php
	lang/nl_NL.mo
	lang/nl_NL.po
	templates/single/post.php

Signed-off-by: Herman Banken <hermanbanken@gmail.com>