update some stuff and password strength v1
Fixed conflicts

Conflicts:
	Source/Client/DataManager.cs
	Source/Client/Model/User.cs