안되겠지
Merge remote-tracking branch 'origin/merge1' into hahaha

Conflicts:
	dbProject/bin/classes.dex
	dbProject/bin/dbProject.apk
	dbProject/bin/resources.ap_