changes in 5 files

changes in 5 files
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	config/config.php
header, menu & test

3 files conflict