Préparation pour release
update message
Merge branch 'developpement'

Conflicts:
	README.md
	joomla.sql
	joomla320.sql
	joomla320fr.sql
	joomla_fr.sql
	sample_data.sql
	sample_data_fr.sql
Merge branch 'master' into developpement