Merge pull request #122 from JetAlone/develop-qm

Develop qm
Merge pull request #123 from JetAlone/develop-qm

Develop qm
Merge pull request #125 from JetAlone/develop-qm

Develop qm
a
Merge branch 'develop-qm'

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