Removed all UUID's so that dups don't get used by accident.  Updated
Version 3.1.12.012
Merge branch 'develop' into feature-gigya