Review player color selection process
Edit - Integrate layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/screen.js
	public/levels/lab.json