More work to top level list view layout
Added the menu inflater back
Adding the color file
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
Merging code
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics

Conflicts:
	GeoTopicsActivity/AndroidManifest.xml
	GeoTopicsActivity/res/values/strings.xml
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/BrowseActivity.java