Merge pull request #16 from warszawajug/staging

Ogarnięcie maili i bugi
Merge branch 'staging'