updates for custom data
Corrected Jean-Luc Picard's birthDate ;)
Merge branch 'source' into customData
Merge branch 'customData' into dev