fix few bugs
Merge branch 'master' of https://github.com/pellucide/Android-Switch-Demo-pre-4.0

Conflicts:
	android-switch-demo/src/com/appscumen/example/AndroidSwitchDemoActivity.java