blame tooltips squash commit
Merge remote-tracking branch 'origin/master'
updated plugin for new json form