Merge branch 'master' into development
Merge branch 'development' of github.com-everon:oliwierptak/Everon into development