I broke the build sorry, fixed. (+2 squashed commit)

Squashed commit:

[234f546] Invert function in dateScale was not working correctly. Fixed

[fed3861] Bugs in the dataGenerator and dateTime scale fixed.
Rebase