initial rails 4 upgrade
Merge branch 'master' into feature/rails_4
Merge branch 'feature/rails_4' into develop
bump version
Merge branch 'release/0.0.2'