Merge branch 'master' into community

src/api/static/js/dashboard.js

@@ -150,7 +150,8 @@ monitor.processes.trend.render = function (logs, key,label) {
 	conf.options.scales.xAxes = [
 		{
 			
-			type: 'time',
+			type: 'timeline',
+			unit:'hour',
 			gridLines: {display:false},
 			
 			time: {