Merge branch 'master' into dev
Update gradle
Added German translation and Japanese translation
Updated all other translations
Merge branch 'dev' into androdi-l-dev

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
Update gradle file with shrinkResources
Update gradle file with shrinkResources