Fixed time control
Cleaned up some messages
UI cleanup
Merge branch '1.1.7-RELEASE'
Updated version numbers.