Added unpatching to settings screen
Merge conflicts
More merge fixes
Fixed bug with iteration and lambdas
Added test case for unpatching
Moved create_olaclient_callback for reusability
Moved patching and unpatching code to the appropriate classes
Broke SettingsScreen layout into new .kv file
Fixed many whitespace issues
Moved OLAD start/stop handlers to appropriate places