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

Conflicts:
	src/MemberShip/Ornament.MemberShip.Web.Plugin/Scripts/User/Edit.js
	src/Mvc5WebApplication/js/app.config.js