test git Khoi
Add product and category service
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
Fix bug on webservice so that webclient can read json sent by the webservice
Merge pull request #6 from sontayninh/Khoi-Branch

Fix bug on webservice so that webclient can read json sent by the webser...
Merge branch 'origin/master'
change port