Fix [ bug #1454 ] Mention de bas de page erroné
Do not display dictionnay for non activated module
Do not reset index on product import !!!
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Fix link element from project "associates object" pages
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
Better error return
Merge branch '3.5' of github.com:FHenry/dolibarr into 3.5

Conflicts:
	ChangeLog