Re: #1703 - implemented latest changes to layout and functionality - adding forgotten model class
Merge branch 'ticket-1703' into develop
Merge branch 'develop' into test