changed example to be easier and clearer to understand
Merge pull request #1001 from dfberry/1.6.0

changed example to be easier and clearer to understand
Fixes settings date format not visible right after install
Merge pull request #1003 from rustyswayne/1.5.2

Fixes settings date format not visible right after install
Merge branch '1.5.2' into 1.6.0
Merge remote-tracking branch 'merchello/1.6.0' into 1.6.0