re commit
Merge branch 'master' of https://github.com/msebasl/kingofapps

Conflicts:
	king/configure_content.php
	king/content.php