634 - Added tooltips
Merge dev/j3/common with development
Merge dev/j3/common with development
Merge branch 'dev/j3/common' into dev/j3/free
Fixed translations and toolbar
Merge branch 'dev/j3/common' into dev/j3/free