some additional information about jokes
fix mvn shell shortcut
a better chat
A better chat

Merge branch 'development'