First commit of plugin code
Merge branch 'hotfix/jbridg4th-03-20-2014'