small changes
Merge branch 'master' of https://github.com/julianch/BondiApp

Conflicts:
	BondiApp/src/com/bondi/SelectRouteActivity.java