New time functions and cleanup in BaseApp
Bumped version number
Merge branch 'release/0.6.1' into develop