change api
Merge branch 'master' of https://github.com/locntv/spot

Conflicts:
	bonfire/application/controllers/api.php