fixed two typos
Merge branch 'hotfix/changeDomainInPasswordForgettEmails'

* hotfix/changeDomainInPasswordForgettEmails:
  fixed two typos
fixed several bugs
fixed design issue
added provisioning a bit more, but rbenv wont work :(
updated gems
Merge branch 'develop'

* develop:
  added remove couple functionality
  added validation so that users cant add others which are bound
Merge branch 'develop'

* develop:
  fiixed dev url and translations
  fixed js bug
  used existing method
  added bugfix (dont show danced tournaments too early
  hups
Merge branch 'develop'

* develop:
  fixed bug
  improvements
  added weekly mailer
  added translation
  refactored

Conflicts:
	Gemfile.lock
removed refactoring
fixed typo
hups
fixed bug
fixed method
fixed couples bug
split up latin and std
sort by date number seems shitty
and now in the right order
added filter functionality to printing
refactored