Merge branch 'dev' into ActiveAdminCanCan
Merge branch 'dev' into ActiveAdminCanCan
slider fix after removing turbolinks
Merge pull request #107 from is-valid/687comments

687comments
Fixes after merge from dev
Merge pull request #108 from is-valid/ActiveAdminCanCan

Active admin can can
Gems - capistrano, unicorn added + deploy.rb + unicorn.rb to git ignore
Gem truncate_html added + htmlentities + nokogiri added + remove some spaces in code
attempts to use tinymce but failed
Merge pull request #109 from is-valid/ActiveAdminCanCan

Active admin can can
Merge branch 'dev' into 687comments