Merge branch 'fix-admin-navbar'
added base class for text entity
Merge branch 'master' into 2.1