Merge branch 'master' of https://github.com/Sijmen/SwitchIt

Conflicts:
	switchit/_attachments/switch.js