add div,span to allowed tags
Merge branch 'develop' into 1.x-stable