Merge branch 'master' of https://github.com/born2net/signagestudio_web-lite

Conflicts:
	style.css