k
Merge branch 'bootstrap3_ui' of github.com:luqizheng/OrnamentFramework into bootstrap3_ui

Conflicts:
	src/MemberShip/Ornament.MemberShip.Web.Plugin/Areas/MemberShips/Views/User/Edit.cshtml
aasdf