So, we're armed and ready for the next conflict.
Ok, now we are.
Merge branch 'v2'

Conflicts:
	SwitchButton.java

No way I will do it in a console ever again... Still confused about
results.