[spalenque] - #7850 *DONE
[spalenque] - #7850 *DONE
[spalenque] - #7850 *DONE
[smarcet] - #7871
* fix on css

Conflicts:

	openstack/code/utils/CustomHTMLFields/CustomUploadField.php
[spalenque] - #7850 *BUGFIX
[smarcet] - #7868
* fix in sangria tools
* fix on css
[smarcet] - #7872
* changed error code from 500 to 502 when a db timeout happens.

Conflicts:

	sample._ss_environment.php
[smarcet] - #7877
* fix migration issue
[spalenque] - #7304 *BUGFIX
[spalenque] - #7304 *BUGFIX
[smarcet] - #7304
* fix on upload field
[smarcet] - #7304
* fix on validation
[smarcet] - #7304
* fix on file upload

Conflicts:

	openstack/code/utils/CustomHTMLFields/CustomUploadField.php
[spalenque] - #7304 *WIP
[smarcet] - #7304
* fix on validation
[spalenque] - #7304 *WIP
[spalenque] - #7304 *WIP