fix bug & update gui
Merge branch 'master' of https://github.com/hiepluonghlv/aseagle

Conflicts:
	src/WebPlatform/AseagleBundle/Controller/MainController.php
	src/WebPlatform/AseagleBundle/Entity/Product.php~
	src/WebPlatform/AseagleBundle/Resources/views/Main/index.html.twig