Merging Gerard's Branch

music/video/timer/appliances