Added /time setting
Implemented /time preference
Merge branch 'master' into xep-0223