Merge in from dev
Revert "Revert "Update ToolTip and HelpText values""

This reverts commit 5d8c86951797b9a44cad85d2f8775973a3ad6806.
Merge in changes that where reverted on dev branch
Re-commit huggs's revert from Friday
Revert "Re-commit huggs's revert from Friday"

This reverts commit 1e234e43a584156b20f79d42b108dbf755ac9cc0.
Merge branch 'development' of http://rsaklfsvrgendev:8080/tfs/defaultcollection/_git/Warewolf%20Open%20Source