Pull in US83 Base
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
Pull in US83 Discount Base
brands sort
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83
merging
comments
Merge branch 'master' of github.com:imagecms/ImageCMS

Conflicts:
	application/modules/install/_install.php
Merge branch 'userstory83' of github.com:imagecms/ImageCMS