Merge remote-tracking branch 'origin/master'

Conflicts:
	www/index.html

Changed client JS to point to mobileremotecontrol.info/marov/A1