Merge branch 'master' of github.com:federicomaffei/WorkMap
introduced mailer test
changed shop to retail
fixing merge conflicts
another merge conflict fixed
allowed users to edit in PDFs and images
Merge branch 'master' of github.com:federicomaffei/WorkMap into bugfix
Turned user edit into modal
Merge branch 'master' of github.com:federicomaffei/WorkMap into bugfix
Merge branch 'bugfix'
merging with master
Merge branch 'master' of github.com:federicomaffei/WorkMap
fine tune to applications layout;
git status
q
moved navbar into partial
Merge branch 'master' of github.com:federicomaffei/WorkMap
pushing to master
Merge branch 'master' of github.com:federicomaffei/WorkMap
Merge branch 'master' of https://github.com/federicomaffei/WorkMap into final_changes
final changes