fix plugin
baza itemxy
forms etc
Merge branch 'master' of github.com:randwsw/asanti

Conflicts:
	js/tinymce/plugins/preview/preview.html
	shop.php
shopfix