some changes
Merge branch 'master' of https://github.com/maxventu/ExerNet
Changes for Administrator
Merge branch 'master' of https://github.com/maxventu/ExerNet

Conflicts:
	Models/IdentityModels.cs