Bumped development version to 0.4.0
[ci skip]
Rails 4 rc2
fixed conflicts