rails 4
Merge github.com:Devvv/kabbalah
rails 4