Merge branch 'hotfix/0.3.1'
fixed conflicts
Updated database_cleaner gem
resolved conflicts [ci skip]