fixed the language bug, introduced another bug on the Other
Merge branch 'master' of github.com:Fabricatorz/eye-report-app-android

Conflicts:
	assets/www/css/index.css