fix active admin - post bug
fix test
Merge branch 'dev' into 680_Image
Merge branch 'dev' into routes_friendly_id
comments now upload using AJAX..but not ready yet. Returned turbolinks, and bug with popups
foggoted files)
removed hidden file
technology <has one>
merge dev into 680
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
finished comments, improves styles
fix merge
Merge pull request #91 from is-valid/680_Image

680 image
Merge branch 'dev' into routes_friendly_id
Merge branch 'dev' into routes_friendly_id
Service admin fixes