Merge branch 'dev' into routes_friendly_id
Seeds.rb fixes
Merge pull request #81 from is-valid/new_js_valid

New js valid
Merge branch 'dev' into routes_friendly_id
routes ready - blog/date/title
Routes fixes for comments
Admin comments ok
fix post image <has_many to has_one>
Merge pull request #82 from is-valid/routes_friendly_id

Routes friendly
fix post create
Remove commented code from post.rb
Merge pull request #83 from is-valid/routes_friendly_id

Remove commented code from post.rb
add all batch_action in activ admin & add/fix upload_file
Merge branch 'dev' into 680_Image
Merge branch 'dev' into 686valid
Merge pull request #84 from is-valid/680_Image

680 image
fix conflict