634 - Added tooltips
Merge dev/j3/common with development
Merge dev/j3/common with development
Fixed translations and toolbar