test commit
added rs-default.png as a dummy image
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BACKEND/APP.JS
	www/rs-default.png
resolved conflict in filepath for uploader.dir
"added rs-default.png manually"
Merge remote-tracking branch 'upstream/master'
Added first version of laser pointer
Merge branch 'master' of https://github.com/vasyaivanov/mobremcon

Conflicts:
	BACKEND/APP.JS
	www/grab.png