Added classes needed for new layouts.
Merge branch 'develop'