after merge 1209
Merge branch 'master' of github.com:taglog/baobaowansha

Conflicts:
	baobaowansha2/AppDelegate.m
	baobaowansha2/HomeViewController.m