Update add
Update add
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
REF

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Merge branch 'develop' of https://github.com/JetAlone/ERP into develop
REVERT!

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>