Fixes Bug: Unable to logout on Ubuntu servers with sef turned on, by replacing login.php with a .htaccess rule [#449 state:resolved]
(cherry picked from commit a6f7670)
Restores login.php file
Merge branch 'develop' into feature/container2

Conflicts:
	login.php