a
Merge branch 'develop-qm'

Conflicts:
	php/framework/template/smarty
Merge branch 'master' into develop