Add switches
Merge branch 'master' of https://github.com/Mras2an/recoVocal

Conflicts:
	Android/src/com/example/Domotique/MouseActivity.java