Merge branch 'crud' of /home/aliet/geotagger with conflicts.
Merge remote-tracking branch 'origin/crud' into crud
Edit redirects to index
Added flash back messages in categories