Resolve #2021 "04 16 branched from master ini file device"

Completed ini example. Don't merge before !23 (merged). Small unrelated change slipped in to this branch, will need to fix that first.

devices/examples/HW_device_template.py

@@ -14,8 +14,13 @@ from tango.server import run
 from tango import AttrWriteType
 # Additional import
 
+<<<<<<< HEAD:devices/HW_device_template.py
+from src.attribute_wrapper import *
+from src.hardware_device import *
+=======
 from util.attribute_wrapper import attribute_wrapper
 from util.hardware_device import hardware_device
+>>>>>>> master:devices/examples/HW_device_template.py
 
 __all__ = ["HW_dev"]