Dialing in the last few bits of the layout
Merging for push
Merge branch 'dev' of https://github.com/tstein4/urbuses-wear into material

Conflicts:
	mobile/src/main/java/com/e13engineering/urbuses/MainStopFragment.java
	mobile/src/main/res/layout/compound_listview.xml
	mobile/src/main/res/layout/fragment_main_stop.xml
	mobile/src/main/res/values/styles.xml