forgot pwd & secret Q and generate pwd - needs revision i'm too sleepyyyy

needs revision - too sleepyyyy
fixed conflicts

Conflicts:
	Source/Client/DataManager.cs