Merge branch 'generic' into cabelas
Commit form generic - pc
Cabelas branch update
update on generic
Merge branch 'generic' of https://github.com/miguelandia/malckydesign into generic

Conflicts:
	brassring.php
Extra comment - generic
update on cabelas
Merge branch 'generic' into cabelas

Conflicts:
	brassring.php
Merge branch 'cabelas'

Conflicts:
	brassring.php