More tests
More tests
Merge branch '1_sdk_beta' into 2_demo_app
Settings Activity persistence; Session timeout input added