test git Khoi
Add product and category service
Merge branch 'origin/master'

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

Khoi branch