Added screens query parameter
Merge branch 'master' into arch

Conflicts:
	js/Sim.js