Fixing the layouts again, split into multiple activities
Merge branch 'james'

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