Fix cintegration config
Fix cintegration config
Remove sdk.dir definition
Upgrade gson to 2.2.2 version
update gson xml library (fixed parser bug)
Merge with master