html safe removed
Merge branch 'development'