Conflicts: app/css/desktop.css app/js/directives.js app/partials/desktop/photo_modal.html app/partials/desktop/user_modal.html