Merge branch 'release/1.2'
Added documentation on the date format filter
Merge branch 'master' into develop