updates from first real test
Merge branch 'master' of https://github.com/faronel/Shooteria2

Conflicts:
	LabelPrint/LabelData.cs
	View/Tabs/ShooterDesk.cs