config api to retunr json type
Merge branch 'master' of github.com:nguyen-phuoc-mulodo/TimChoi
Merge branch 'master' of github.com:nguyen-phuoc-mulodo/TimChoi
Merge origin/master

Conflicts:
	Source/ci/application/views/map.php
Source/ci/application/config/facebook.php