Added eventDate in SensorData
Fixed bug in key generation for SensorData and LivingData
Modified test data generator accordingly to the above changes