fix for develop mode client
Merge branch 'master' of https://github.com/hbaaron/ikan

Conflicts:
	client/cloudchat/index.html.debug