Base for base
Merge branch 'master' of https://github.com/Redmart/api-commons