Merge branches 'master' and 'sr' of https://github.com/shilad/wikAPIdia into sr
Merge branch 'sr' of https://github.com/shilad/wikAPIdia into sr