login and other minor changes
merge conflict resolved
access rights done,small changes in other modules