Merge branches 'temp' and 'version2' into version2
Merge branches 'version2' and 'temp2' into version2
minor adjust for logging data, and white balance position