1,测试ng-cloak
Merge branch 'master' of https://github.com/hcsoft/yl_deploy

Conflicts:
	templates/marry_check/marry_check_info.html