Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
fix
Merge branch 'origin/master'

Conflicts:
	mvc/front/hello/controllers/HelloController.php
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
add Toolkit for image
fix imageToolkit
fix helloController
Merge remote-tracking branch 'refs/remotes/origin/maks_fix'