fixes
Merge branch 'master' of https://github.com/krishamoud/meteor-translate

Conflicts:
	client/views/chat/chat.js
mostly done