removed user edit again
Merge branch 'master' of https://github.com/svennyffenegger/password-manager-asp

Conflicts:
	App_Data/ASPNETDB.MDF
	App_Data/aspnetdb_log.ldf
	admin/EditUser.aspx
	admin/EditUser.aspx.cs
	admin/MemberList.aspx
	admin/MemberList.aspx.cs