Updated for use with new FS classes
Merge branch 'master' of https://github.com/Noterik/smt_demolinkedtvapp

Conflicts:
	WebContent/WEB-INF/lib/smt_demolinkedtvapp.jar