Merge branch 'master' into heroku_master
assets fix
assets fix
assets fix
Assets fix
Kaminari added
kaminari added
Including all of foundation instead of trying to include seperate plugins