madrid version of web application
Merge remote-tracking branch 'origin/master'

Conflicts:
	madrid/Automat/Automat/App_Code/IDScanner.cs
	madrid/Automat/Automat/App_Code/Printer.cs
	madrid/Automat/Automat/Automat.csproj