Trying to improve pesence handling
Merge branch 'master' of https://github.com/guillemborrell/cloudchat

Conflicts:
	js/controller.js