Added devise gem from github plataformatec/devise at branch rails4 will
probably need to update upon upgrade rails to stable release.
merge conflict fix
installed devise, generated user model and views