Textdomain fix
Merge branch 'master' of https://github.com/Horttcore/WordPress-Theme-Boilerplate

Conflicts:
	functions.php