evert "Switches now have an sell-by-date"

This reverts commit eddb2722ebfd58ed33b47ef735c8f26260b0b1b8.

Conflicts:
	common/app/conf/switches.scala