add the Device template back to Ms.Win and Ms.Win.Powershell. bump version.
Merge pull request #30 from zenoss/feature/ZEN-7455

Please review branch feature/ZEN-7455
Merge pull request #31 from zenoss/develop

merging to master as a workaround for no Jenkins develop build yet.