UI
Merge branch 'UI'

Conflicts:
	mobile/src/main/java/com/e13engineering/urbuses/mainHandheld.java
	mobile/src/main/res/values/strings.xml