update
Merge branch 'pixel-admin' of https://github.com/butschster/kodicms into pixel-admin

Conflicts:
	cms/modules/kodicms/views/system/blocks/footer.php