Merge branch 'master' of https://github.com/Cris92x/Doge

Conflicts:
	ui - Copy/js/highcharts-all.js
	ui - Copy/js/highcharts-more.js
	ui - Copy/js/highcharts.js
	ui - Copy/js/modules/data.js
	ui/img/WS_FTP.LOG
	ui/img/hazard-icon.png
	ui/img/home-icon.png
	ui/img/nutr-icon.png
	ui/img/recall-icon.png
	ui/img/setting-icon.png
padding fixes