Revision
Merge branch 'master' of https://github.com/sbobhate/Android-Applications

Conflicts:
	Modular UI/res/values/strings.xml