Merging
Merge branch 'master' of https://github.com/joomlaworks/k2-v3-dev-build