Add Green Sunshade, Tam O'Shanter, Mysterious Mask
Merge branch 'hats' into stable-test
Merge branch 'valentines' into stable-test

Conflicts:
	client-data
Revert "Merge branch 'valentines' into stable-test"

This reverts commit 52925529df905afdd919cb7ecff6a049e10bba37, reversing
changes made to 56219a5a389e8bcf8e76aa3bfab63d402770c7f9.
Merge branch 'XmasFix' into stable-test