last changes
changes of last sprint
Merge branch 'master' of https://github.com/olw/api