new UI
Merge branch 'master' of https://github.com/pahariavivek/CARTS.git

Conflicts:
	TransitPlanner/src/com/example/transitplanner/MainActivity.java
more options ui changed