all UIs
Merge commit '7d3824e93a37eeacb4fec3b102317be2d75683ea' into b1

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/TaggingApp.apk
	bin/classes.dex
	bin/classes/com/example/taggingapp/R$drawable.class
	bin/classes/com/example/taggingapp/R$id.class
	bin/classes/com/example/taggingapp/R$layout.class
	bin/classes/com/example/taggingapp/R$menu.class
	bin/classes/com/example/taggingapp/R$string.class
	bin/classes/com/example/taggingapp/R$style.class
	bin/classes/com/example/taggingapp/View/MainActivity.class
	bin/classes/com/example/taggingapp/View/PhotoGrid.class
	bin/classes/com/example/taggingapp/View/SignUp.class
	bin/resources.ap_
	gen/com/example/taggingapp/R.java
	project.properties
	src/ca/ualberta/cs/taggingapp/controllers/RegionController.java
	src/ca/ualberta/cs/taggingapp/controllers/TagController.java
	src/ca/ualberta/cs/taggingapp/controllers/TagListController.java
	src/ca/ualberta/cs/taggingapp/models/Picture.java
	src/ca/ualberta/cs/taggingapp/models/Region.java
	src/ca/ualberta/cs/taggingapp/models/Tag.java
	src/ca/ualberta/cs/taggingapp/models/TagList.java
	src/ca/ualberta/cs/taggingapp/models/User.java
	src/ca/ualberta/cs/taggingapp/views/GridViewFragment.java
	src/ca/ualberta/cs/taggingapp/views/SignUp.java
	src/ca/ualberta/cs/taggingapp/views/SwipeSuper.java
	src/ca/ualberta/cs/taggingapp/views/TagsListFragment.java