server
Merge branch 'master' of https://github.com/chucky86boy/kids_mind

Conflicts:
	.classpath
	bin/classes.dex
	bin/classes/com/mb/kids_mind/Adapter/SiteAdapter.class
	bin/classes/com/mb/kids_mind/KidsMindAnalyzeActivity.class
	bin/classes/com/mb/kids_mind/KidsMindTotalResultActivity$1.class
	bin/classes/com/mb/kids_mind/KidsMindTotalResultActivity$2$1.class
	bin/classes/com/mb/kids_mind/KidsMindTotalResultActivity$2.class
	bin/classes/com/mb/kids_mind/KidsMindTotalResultActivity$ScreenSlidePagerAdapter.class
	bin/classes/com/mb/kids_mind/KidsMindTotalResultActivity.class
	bin/classes/com/mb/kids_mind/R$id.class
	bin/classes/com/mb/kids_mind/R$layout.class
	bin/classes/com/mb/kids_mind/R$menu.class
	bin/classes/com/mb/kids_mind/R$string.class
	bin/classes/com/mb/kids_mind/R$style.class
	bin/classes/com/mb/kids_mind/R$styleable.class
	bin/classes/com/mb/kids_mind/Splash.class
	bin/classes/com/mb/kids_mind/fragment/ResultMenu$1.class
	bin/classes/com/mb/kids_mind/fragment/ResultMenu$ScreenSlidePagerAdapter.class
	bin/classes/com/mb/kids_mind/fragment/ResultMenu.class
	bin/classes/com/mb/kids_mind/fragment/SingleResultSketchMenu.class
	bin/classes/com/mb/kids_mind/fragment/SingleSketchMenu$1.class
	bin/classes/com/mb/kids_mind/fragment/SingleSketchMenu$2.class
	bin/classes/com/mb/kids_mind/fragment/SingleSketchMenu.class
	bin/classes/com/mb/kids_mind/fragment/SketchMenu$1$1.class
	bin/classes/com/mb/kids_mind/fragment/SketchMenu$1.class
	bin/classes/com/mb/kids_mind/fragment/SketchMenu$ScreenSlidePagerAdapter.class
	bin/classes/com/mb/kids_mind/fragment/SketchMenu.class
	bin/classes/com/mb/kids_mind/task/ViewResizeTask.class
	bin/kids_mind.apk
	bin/resources.ap_
	gen/com/mb/kids_mind/R.java
	src/com/mb/kids_mind/KidsMindTotalResultActivity.java
	src/com/mb/kids_mind/fragment/ResultMenu.java
	src/com/mb/kids_mind/fragment/SketchMenu.java