Strings and UI modified
Strings
Merge branch 'master' of https://github.com/threeset3/thebusapp

Conflicts:
	svn/res/layout/activity_main.xml