Merge branch 'develop'
fixed Gem file using SQLite on production
Merge branch 'hotfix/fix_gemfile' into develop