@
Merge branch 'open'
Merge pull request #130 from JetAlone/develop

Master
Update add
Update add
Update add
Update
Merge branch 'develop'
Merge branch 'develop' of https://github.com/JetAlone/ERP into develop

Conflicts:
	php/application/controller/module/product/_add/_add.php
	php/application/view/module/product_technology/product.tpl
Merge branch 'master' into develop