'ldf'sda
140830_05
Merge remote-tracking branch 'origin/gunbaek' into Ver1.0

Conflicts:
	.gitignore
	WEBS/bin/WEBS.apk
	WEBS/bin/resources.ap_
	lib-project/AndroidBootstrap/bin/androidbootstrap.jar
	lib-project/actionbarsherlock/bin/actionbarsherlock.jar
	lib-project/slidingmenu/bin/library.jar