license becomes guid. _GUID becomse _IDD
Merge branch '2tier'

Conflicts:
	sample_data/prd_9a_index.txt