no message
Merge branch 'develop' of https://github.com/trendwerk/trendpress-child into develop

Conflicts:
	functions.php
	style.less