test enhanced
upgrade to rails 4.0
finish test for upgrade
conflict resolution
Merge branch 'rails4' of https://github.com/lascar/elemental into rails4