database schema
Merge branch 'tri-branch' of https://github.com/sontayninh/Zend2Test into tri-branch
Merge pull request #3 from sontayninh/tri-branch

Tri branch
test git Khoi
Product Module:
+ read json
+ show each product in category use jcarousel
Use Ajax get product from HAL Json to Dojo dialog
Add product and category service
Merge branch 'origin/master'
Merge pull request #4 from sontayninh/tri-branch

Tri branch
Merge branch 'origin/master'

Conflicts:
	config/application.config.php
Merge pull request #5 from sontayninh/Khoi-Branch

Khoi branch
Merge branch 'origin/master'

Conflicts:
	config/application.config.php
	module/Application/config/module.config.php