Latest modifications
Merge branch 'master' of

Conflicts:
	cat_acquisition.php
	cat_content.php
	cat_interface.php
	cat_technical.php