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

Conflicts:
	script.k2.php