some changes please check
Merge branch 'neil_9162014_0' of https://github.com/iancleverlocal/template into neil_9162014_0
edited please check
Some Updates, plentiful please check
Merge remote-tracking branch 'origin/neil_9162014_0' into merge_9222014

Conflicts:
	Panels/FilterCategory.html
	account_orderstatus.html
	brands.html
	cart.html
	createaccount.html