Merge branch 'hotfix/0.6.14' into develop
bump to rails 4
Merge branch 'release/0.7.0'