time setting now saves
Merge branch 'master' of https://github.com/imush/testapp