profile commit
Donghee commit
ll
recommit
Merge branch 'master' of https://github.com/Quadra-H/AndroidUI

Conflicts:
	bin/DIYMarket.apk
	bin/classes.dex
	bin/proguard.txt
	bin/resources.ap_
	src/com/ssm/quadrah/diymarket/content/MarketMenuLayout.java
	src/com/ssm/quadrah/diymarket/register/MarketRegister.java