18/11
Merge branch 'master' of https://github.com/azizcode/spkpkli

Conflicts:
	protected/views/layouts/front.php