Fix Hakiri issues
Merge pull request #485 from ChrisBr/fix_hakiri_issues

Fix Hakiri issues
Merge pull request #490 from hennevogel/master

Fix accept, reject and confirm mail templates
Merge pull request #491 from hennevogel/master

More accept/reject/confirm fixes
Merge pull request #492 from hennevogel/master

Fix a double render while confirming proposals
remove trailing spaces and blank lines
apply StringLiterals cop (remove double quotes, unless there is string interpolation)
exclude config/ from rubocop styling, more style fixes
deletions
fix quotes on tickets
deletions
Merge pull request #468 from differentreality/styling

Styling
tickets controller fix message
commercials
task to make a user an admin. Alter migration to make admins users with old role of Admin or Organizer
Merge pull request #495 from differentreality/is_admin

Task to create admins and fix in migration
Merge pull request #493 from differentreality/typo

Typos
there's no such thing as Array#to_h

(cherry picked from commit 780bd84bc17f55b0ece1d86a2b224f0340495c73)
rephrase closed cfp in splashpage
Merge pull request #499 from openSUSE/arrays_and_hashes_oh_my

there's no such thing as Array#to_h