Merge branch 'hotfix/1.2.9.2'
Merge branch 'release/1.2.10'
Tweaks for new server
Fix gemfile
gemfile typo
Actually fix the damn thing. Probably.
Merge branch 'hotfix/1.2.10.2' into develop