Manually merged davideugnenepeterson symfony2 dropbox files: app and resources to fix logout and login handler services. changed phone views, routes, controller and naming conventions to work with team instead. No Orm or entity added for that yet.