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

Routes friendly
Project slider fixes
Merge pull request #90 from is-valid/routes_friendly_id

Project slider fixes
merge dev into 680