ctmdroid multilanguage

Conflicts:
	CTMDroid/.classpath
ctmdroid multilanguage

Conflicts:
	CTMDroid/.classpath
Merge branch 'github_develop' into github_master