Fix an issue toggling timeless. Added moment to fix use of the old datejs lib.
Merge branch 'develop' into topic-dojo-upgrade