Merging feature/customer-login into development.

Merging from feature/customer-login into development in order to complete our program.