Merge branch 'android-4.4' of https://github.com/omnirom/android_packages_apps_OmniSwitch into android-4.4

Conflicts:
	src/org/omnirom/omniswitch/SwitchService.java