update catagory IDs
Merge pull request #4 from hoanguyen311/master

Update data
Merge branch 'master' of https://github.com/tuyencao/Q-A-Platform

Conflicts:
	app/scripts/services.js
Merge pull request #20 from tuyencao/master

Adding files