2014-02-24: text translater
Merge remote-tracking branch 'origin/master'

Conflicts:
	python/text/translator.py