Changes
Resolved conflicts
.htaccess login bugfix with the new .htaccess