Moving UUID generation into Store constructor
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/lib/storage/AbstractTable.h
Merge fix