Fixed the factories and added small UI changes
Merge branch 'master' of github.com:CMPUT301W14T12/GeoChan

Conflicts:
	src/ca/ualberta/cs/views/TopicListActivityFragment.java