Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems

Conflicts:
	gulpfile.js

diff --cc gulpfile.js
index d55101d52ede928a2826720ccb2749c047294235,09ce81eff16458c82ef689c16da48d66fa741697..4115ab8a3479ef67714ac653177d51a39538cd41
--- 1/gulpfile.js
--- 2/gulpfile.js
+++ b/gulpfile.js
@@@ -34,7 -34,7 +34,8 @@@ var srcFiles = 
        './src/elements/**',
        './src/charts/**',
        './node_modules/color/dist/color.min.js',
-       './node_modules/javascript-detect-element-resize/detect-element-resize.js'
++      './node_modules/javascript-detect-element-resize/detect-element-resize.js',
+       './node_modules/moment/min/moment.min.js'
  ];
  
  

diff --cc package.json
Simple merge

diff --cc src/core/core.controller.js
Simple merge

diff --cc src/core/core.helpers.js
Simple merge