try to fix multiple-activity problem
Merge remote-tracking branch 'origin/master'

Conflicts:
	paac/src/edu/cmu/paac/activity/MainActivity.java
new layout. except for the routes details page