some documentation work
Merge branch 'origin/master'

Conflicts:
	inc/app/core/controller.php