Change message type to 'normal' for ONLINE clients, 'chat' for ONLINE_WITH_OTHER_APP + OFFLINE
Update npm version
Update Gruntfile to fix freedom src dependencies, and package.json to use new freedom versions
Merge branch 'master' of https://github.com/freedomjs/freedom-social-xmpp into dborkan-chat

Conflicts:
	Gruntfile.js
Merge pull request #37 from freedomjs/dborkan-chat

Change message type to 'normal' for ONLINE clients, 'chat' for ONLINE_WITH_OTHER_APP + OFFLINE