开关未起效
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	BabyPlan/views/index.jade
页面设计1

Signed-off-by: Administrator <Administrator@2013-20140406DS>