fixed assign UID, added PID to image data, first version of aida data
Merge branch 'master' into mergedata