Merge pull request #272 from AndHam89/master

Two errors corrected and refactoring done.
Add a 'Notes' field to DeviceTemplate in the equivalent manner as e.g. Cabinet has it.