Merge remote-tracking branch 'origin/develop' into develop
* Layout fix for view buttons
* Made group label de required in js
Merge remote-tracking branch 'origin/develop' into develop