translator
Merge branch 'master' of https://github.com/rothariel/aimnegochat

Conflicts:
	translation.js