Rails 4 rc2
fixed conflicts
Bumped develop version to 0.5.0