minor changes
minor
Merge branch 'master' of https://github.com/Mind4all/oop

Conflicts:
	classes/model/ClassDbWrapper.php