Add documentation about user-specific property files
Messages caching is based on seconds, not milliseconds
Merge remote-tracking branch 'upstream/admin3'