migrated to rails 4
conflicts due to rails 4