Update - important
Merge pull request #155 from JetAlone/php/plugins

Php/plugins
Merge branch 'master' into issue/initial

Conflicts:
	core/framework/controller.php
	public/app/view/module/product_technology.html