new features
Merge branch 'master' of https://github.com/svennyffenegger/password-manager-asp

Conflicts:
	auth/Login.aspx
merge
Merge branch 'master' of https://github.com/svennyffenegger/password-manager-asp

Conflicts:
	App_Data/ASPNETDB.MDF
	App_Data/aspnetdb_log.ldf
	MasterPage.master
	user/ManageAccount.aspx