commit 201311282043
Merge branch 'master' of https://github.com/Go-JunYeong/git_sos

Conflicts:
	bin/Sos_MainTabActivity.apk
	bin/classes.dex
	bin/classes/com/hongikapp/utility/sos/Sos_MainTabActivity.class

bin/classes/com/hongikapp/utility/sos/reserved/Sos_ReservedAdapter.class
	bin/classes/com/hongikapp/utility/sos/reserved/Sos_Reserved_main.class

bin/classes/com/hongikapp/utility/sos/reservingin/Sos_ReservingInSelectC
lassRoom$1$1.class

bin/classes/com/hongikapp/utility/sos/reservingin/Sos_ReservingInSelectC
lassRoom$1$2.class

bin/classes/com/hongikapp/utility/sos/reservingin/Sos_ReservingInSelectS
pace.class

bin/classes/com/hongikapp/utility/sos/reservingin/Sos_ReservingInSelectT
ime_CTCalendarView.class

bin/classes/com/hongikapp/utility/sos/reservingin/Sos_ReservingInSelectT
ime_Main.class

bin/classes/com/hongikapp/utility/sos/reservingout/Sos_ReservingOutList.
class
	bin/classes/com/sos/R$id.class
	bin/classes/com/sos/R$layout.class
	bin/classes/com/sos/R$menu.class
	bin/classes/com/sos/R$string.class
	bin/classes/com/sos/R$style.class
	bin/resources.ap_
	gen/com/sos/R.java
	res/layout/space_class_c701.xml
	res/layout/space_class_c702.xml
	res/layout/space_class_c703.xml
	res/layout/space_semina_a.xml
	res/layout/space_semina_b.xml