Add assets
Merge remote-tracking branch 'origin/master'
Merge with Template branch
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/modules/CMSFactory/BaseEvents.php
	application/modules/shop
Merge remote-tracking branch 'origin/template'
Sample Module
merge with TML
Change sample module
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
popupCart
MEGAPush