Did some stuff in testbranch
Merge branch 'testbranch'

Conflicts:
	gtranslate.py