initial commit
Merge branch 'master' of git.rhohub.com:otjhb/DeviceManagerServer

Conflicts:
	.gitignore