a
Merge branch 'master' of
https://github.com/khoraappserver/androidapp.git

Conflicts:
	SnitchV5/src/com/khora/snitch/ViewCustonToggle.java