add json marshal/unmarshal functions
Merge branches 'add-sql-functionality' and 'add-json-functionality' into dev

Conflicts:
	uuid.go