new stuff from glopro
Merge branch 'master' of github.com:brownrl/skeleton

Conflicts:
	inc/functions/function.getContent.php