a
tasks
peer group manager works
peer group manager works
Merge remote-tracking branch 'origin/development' into development
create forum and discover buttons - simple version
create and discover stage 1
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	LiveForum/bin/LiveForum.apk
	LiveForum/bin/classes.dex
	LiveForum/bin/classes/com/example/liveforum/BusHandler$1.class
	LiveForum/bin/classes/com/example/liveforum/BusHandler$SimpleService.class
	LiveForum/bin/classes/com/example/liveforum/BusHandler.class
	LiveForum/bin/classes/com/example/liveforum/CreateForum$1.class
	LiveForum/bin/classes/com/example/liveforum/CreateForum.class
	LiveForum/bin/classes/com/example/liveforum/DialogBuilder.class
	LiveForum/bin/classes/com/example/liveforum/Discover.class
	LiveForum/bin/classes/com/example/liveforum/HostActivity.class
	LiveForum/bin/classes/com/example/liveforum/MainPage$1.class
	LiveForum/bin/classes/com/example/liveforum/MainPage$2.class
	LiveForum/bin/classes/com/example/liveforum/MainPage.class
	LiveForum/bin/classes/com/example/liveforum/R$id.class
	LiveForum/bin/classes/com/example/liveforum/R$layout.class
	LiveForum/bin/classes/com/example/liveforum/R$menu.class
	LiveForum/bin/classes/com/example/liveforum/R$string.class
	LiveForum/bin/classes/com/example/liveforum/R$style.class
	LiveForum/bin/classes/com/example/liveforum/UIHandler.class
	LiveForum/bin/classes/com/example/liveforum/UseActivity.class
	LiveForum/bin/resources.ap_
	LiveForum/gen/com/example/liveforum/R.java
	LiveForum/res/layout/discover_page.xml
	LiveForum/src/com/example/liveforum/BusHandler.java
	LiveForum/src/com/example/liveforum/CreateForum.java
	LiveForum/src/com/example/liveforum/Discover.java
	LiveForum/src/com/example/liveforum/MainPage.java
	LiveForum/src/com/example/liveforum/UIHandler.java