增加discount界面，...导航
Merge remote-tracking branch 'origin/master'

Conflicts:
	Billboard/res/layout/activity_main_item.xml
	Billboard/src/com/yada/billboard/DiscountActivity.java