check commit yoseob
Merge branch 'master' of https://github.com/object0814/AssistApp

Conflicts:
	MainActivity/bin/MainActivity(fi1).apk
	MainActivity/bin/classes.dex

MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$attr.clas
s

MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$bool.clas
s

MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$color.cla
ss

MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$dimen.cla
ss

MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$drawable.
class
	MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class

MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$integer.c
lass

MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$string.cl
ass

MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$style.cla
ss

MainActivity/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$styleable
.class
	MainActivity/bin/resources.ap_
	MainActivity/gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	MainActivity/project.properties
	java/bin/opencv library - 2.4.9.jar
	java/gen/org/opencv/engine/OpenCVEngineInterface.java