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