Merge branch 'hotfix/0.10.1.0'
Merge branch 'release/0.11'
removed colored_date template tag
Merge branch 'hotfix/0.11.1' into develop