Merge branch 'origin/master'
#36450 corrected the site id from 29 to 205
I keep forgetting the catalina/liferay/maven commands.

So I wrote them all down in a python fabric file to ease those tasks.
I keep forgetting the catalina/liferay/maven commands.

So I wrote them all down in a python fabric file to ease those tasks.
fabfile tweaks
#36709 menu adjustment
added more details in tasks's description
#36710 fixed all aui autocomplete to 12px as default font size instead of 100%
minor adjustments
added some french accents
Merge branch 'origin/master'

Conflicts:
	tools/vagrant/fabfile.py
fabfile updates
fabfile adjustments
#39527 ajustements
csv database dump update
Merge branch 'origin/develop'
Tâche / Task #39527 : Dernière modification de mise en page

added the icon for the logout
Tâche / Task #41451 : Dernières remarques de Marc

added the html code for the listing of espaces collabaritfs
[ #41267] VagrantFile
Tâche / Task #41451 : Dernières remarques de Marc

the menu on pages now always displays sub-pages