Add Setting Feature and Various Things has Changed.
Merge branch 'master' of github.com:xuserv/iBeatConAndroid

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/kuna/ibeatcon_android/Controller.class
	bin/classes/com/kuna/ibeatcon_android/ControllerSizer.class
	bin/classes/com/kuna/ibeatcon_android/Join$1.class
	bin/classes/com/kuna/ibeatcon_android/Join.class
	bin/classes/com/kuna/ibeatcon_android/R$id.class
	bin/iBeatCon_Android.apk
	bin/resources.ap_
	gen/com/kuna/ibeatcon_android/R.java
	res/layout/activity_join.xml
	res/menu/join.xml
	src/com/kuna/ibeatcon_android/Controller.java
	src/com/kuna/ibeatcon_android/ControllerSizer.java
	src/com/kuna/ibeatcon_android/Join.java