Fix typos
Move puma configuration to an example file as done with the other config files
Merge pull request #244 from antonio/puma_rb_example

Move puma configuration to an example file
Merge pull request #243 from jojosch/fix-typos

Fix typos
Fix ui for 1366px displays
Add retry functionality
Lets do version 3.1
Update rails and puma
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Update rails and puma
  Lets do version 3.1
  Add retry functionality
  Fix ui for 1366px displays
  Move puma configuration to an example file as done with the other config files
  Fix typos