Merge branch 'dev' into routes_friendly_id
Fixes with image upload
Merge pull request #89 from is-valid/routes_friendly_id

Routes friendly