Order by array
Merge branch 'master' of github.com:AJenbo/knjphpfw

Conflicts:
	objects.php