Renaming momentjs to moment to be aligned with momentjs.com
Resolving conflicts