Merge branch 'master' of host01:/

Conflicts:
	etc/netctl/switch0
	etc/netctl/switch1