a
a
Merge branch 'master' of https://github.com/jobpassion/coolplay_web

Conflicts:
	service/spikeService.coffee