Merge pull request #9 from stulees/master

[Settings] Adding date format with conditional logic, HTML and localization refactoring