Testing new organization

Testing new organization
Merge branch 'master' of https://github.com/lia-dc-ufscar/emotifeed

Conflicts:
	emotifeed/client/newMessage/newMessage.coffee