Comments and cat fix
Merge remote-tracking branch 'origin/template'
Merge with Template
change logger. TMP
Merge With master
merge with Master
fix after merge
Merge remote-tracking branch 'origin/template'
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/modules/comments/commentsapi.php
	templates/new_shop_template/shop/default/category.tpl
change fancybox
Merge remote-tracking branch 'origin/template'
Merge remote-tracking branch 'origin/template'
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/modules/comments/commentsapi.php
Merge remote-tracking branch 'origin/template'
Merge remote-tracking branch 'origin/template'
Category Documentation
Merge branch 'master' of github.com:imagecms/ImageCMS into template
wish_list
merg