new merge
Merge branch 'master' of github.com:imagecms/ImageCMS into template
Merge branch 'template' of github.com:imagecms/ImageCMS into template

Conflicts:
	application/modules/shop
after stash
Push template product old Base
comments (not fin)
comments (not fin)
widgets and start_page
Merge branch 'template' of github.com:imagecms/ImageCMS into template
comments (not fin) ninja merge fix
Merge branch 'template' of github.com:imagecms/ImageCMS into template
popupCart
MEGAPush
exchange fixes and category, filter tpl come back to propel objects
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge Template with Master