Merge pull request #87 from is-valid/routes_friendly_id

Routes friendly
Merge branch 'dev' into routes_friendly_id
Fixes with image upload