Merge remote-tracking branch 'origin/master'

Conflicts:
	endre-klasse.php
	php/database/classModel.php
class
dsg