Merge branch 'ait-develop' of https://github.com/OpenIotOrg/openiot into ait-develop

Conflicts:
	.gitignore
Merge branch 'ait-develop' of https://github.com/OpenIotOrg/openiot into ait-develop

Conflicts:
	.gitignore
Added CDataAdapter to OAMO and QueryRequest classes