Remaining Files for bug #78
Merge commit '15485ea96bb20c938568c76e1f6852144a36fbe4'

Conflicts:
	Code/RestaurantManagementSoftware/application/classes/Controller/Login.php
	Code/tests/tests/acceptance/LoginCest.php