add rails 4 support
Merge branch 'master' of github.com:joseramonc/adminpanel
Merge branch 'master' into rails-3.x