Fix inconsistencies with the rails 4 upgrade + fix SVG-edit issue