Fixed test
Merge pull request #362 from sylvaindeloux/master

Fixed test
Removed columns from form labels
Merge pull request #363 from Bladrak/removedColumns

Removed columns from form labels
[documentation] improve Sphinx support
SONATA-124 - Update documentation
Merge pull request #364 from grosenbaum/update-documentation

SONATA-124 - Update documentation
Merge branch 'sonata-project/master'

Conflicts:
	Resources/doc/reference/profile_edition.rst