Merge branch 'master' of https://github.com/HAXEN/Seerefine

Conflicts:
	Seerefine.web/web/js/scriptLive.js