clear commit
Merge pull request #1 from xladde/develop

Develop
Switched 'uchar' to 'int' in device map in class Controller.
Switched 'uchar' to 'int' in device map in class Controller.
Deleted current master sources. This is to merge the develop-branch.
come closer to automerge...
solved some merge conflicts