misc
Merge branch 'master' of https://github.com/gongqinwei/yidongzhangdan

Conflicts:
	BDC/en.lproj/MainStoryboard_iPhone.storyboard