Adding customer login feature
Merge origin/develop into develop