user login / registration added
Merge origin/master