trailing text inside a <span></span>
inline inputs on change rows divs
additional checkbox in fields display inline
Merge branch 'jcarrion/server3.3styles' of github.com:Zentyal/zentyal into jcarrion/server3.3styles
Merge branch 'jcarrion/server3.3styles' of github.com:Zentyal/zentyal into jcarrion/server3.3styles
Merge branch 'jcarrion/server3.3styles' of github.com:Zentyal/zentyal into jcarrion/server3.3styles
more table forms to divs
more table forms to divs
Merge branch 'jcarrion/server3.3styles' of github.com:Zentyal/zentyal into jcarrion/server3.3styles
more table forms to div forms
Merge branch 'jcarrion/server3.3styles' of github.com:Zentyal/zentyal into jcarrion/server3.3styles

Conflicts:
	main/core/src/templates/ajax/modal/addElement.mas