Merge branch 'devel' of https://github.com/Mlnx-GSO/sysinfo-html

Conflicts:
	.gitignore