Small fixes
Merge branch 'master' of https://github.com/Horttcore/Template-Meta-Boxes

Conflicts:
	template-meta-boxes.php