Revert "Merge branch 'master' of https://github.com/customato/customato"

This reverts commit db651c48bb7e01fa49360f356e0c2cf1c2b3abff, reversing
changes made to f2e379c7bcf2b6b35309209cd7682de981a3f819.
Revert "Revert "Merge branch 'master' of https://github.com/customato/customato""

This reverts commit 39a507b524817665d7350eafefa3eae5de143698.
Revert "Merge branch 'master' of https://github.com/customato/customato"

Conflicts:
db/schema.rb
db/seeds.rb
Merge branch 'Test'