entrances form validation
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/desktop/EntrancesWindow.js