Merge branch 'hotfix/jQueryUI'
Merge branch 'release/NestedResources'
Update to rails 4.0.0
Merge branch 'hotfix/rails4' into develop