Merge "Fixing Button so shows unselected color when set" into devel/master