fixed remember me button and project menue
fixed merge conflict