Merge branch 'generic'
test 3
Merge branch 'master' into generic
update on generic
Merge branch 'generic' of https://github.com/miguelandia/malckydesign into generic

Conflicts:
	brassring.php