conflicts merges;
Merge branch 'master' of github.com:imagecms/ImageCMS
Merge branch 'master' of github.com:imagecms/ImageCMS into template
shop and base tempales main.tpl done, user login and logout done