first development
Merge remote-tracking branch 'origin/development' into development
Merge remote-tracking branch 'origin/development' into development
first createForumDev
discover updated to pass extras
Merge remote-tracking branch 'origin/createForumDef' into
forumdevelopment

Conflicts:
	LiveForum/bin/classes/com/example/liveforum/BusHandler$SimpleService.class
	LiveForum/bin/classes/com/example/liveforum/BusHandler.class
	LiveForum/bin/classes/com/example/liveforum/Discover.class
	LiveForum/gen/com/example/liveforum/R.java