Clean up and some more UI updates.
Merge branch 'master'.

Conflicts:
	FirstProtoApp/src/org/apps8os/trafficsense/first/MainActivity.java