Update code for HTML escaping by default.
Use raw for date picker.
Merge branch 'develop'