Various fixes
Merge branch 'master' of github.com:Wyattjoh/TaggingApp

Conflicts:
	src/ca/ualberta/cs/taggingapp/views/TagsListFragment.java