Added Visualforce plugin
Put labels under the correct parent
Merge pull request #2371 from brucardoso2/master

Added Visualforce plugin