User management related changes
Merge branch 'master' of https://github.com/nirshandileep/DairyManager