commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes.dex
	bin/iSee.apk
	bin/resources.ap_
	res/layout/activity_search.xml
	src/com/isee/SearchActivity.java