New welcome message

Infos about naming scheme and traffic control
Merge remote-tracking branch 'origin/master'
fix typo