API naming conventions again
Merge branch 'master' of github.com:anqqa/klubitus