small changes for production
Merge remote branch 'origin/gimli/devise-auth' into gimli/devise-auth
zmeny potrebne pro produkcni verzi (mailer)