jhkgf

hgk
Merge remote-tracking branch 'origin/RoleManagement' into RoleManagement

Conflicts:
	RRV2.0.1/MvcApplication3/App_Data/MyDatabase.mdf
	RRV2.0.1/MvcApplication3/App_Data/MyDatabase_log.ldf

	RRV2.0.1/MvcApplication3/App_Data/aspnet-MvcApplication3-20141004215101.mdf

	RRV2.0.1/MvcApplication3/App_Data/aspnet-MvcApplication3-20141004215101_log.ldf
	RRV2.0.1/RRv2.0.1.v12.suo