Changing user management
Merge branch 'master' of https://github.com/nirshandileep/DairyManager

Conflicts:
	Source/DairyManager/DairyManager/Client.aspx.cs
	Source/DairyManager/DairyManager/Site.Master.cs
	Source/DairyManager/DairyManager/Task.aspx.cs