Commiting something to pull
Style main activity after edit availability button was added
Hope this works
Merge branch 'master' of https://github.com/TheHubMobileApp/TheHub
Hopefully the final commit in this botched merge lololol

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml
	app/src/main/java/com/thehub/thehubandroid/UpdateAvailabilityTask.java
	app/src/main/res/layout/activity_main.xml
	local.properties