iawh
Merge branch 'master' of https://github.com/nonjucto/DBMarketplace.git

Conflicts:
	DBM/bin/DBM.apk
	DBM/bin/classes.dex
	DBM/bin/dexedLibs/android-support-v4-b39785856651e0c95320a3e96b5058f8.jar
	DBM/bin/resources.ap_