Merge origin/master

Conflicts:
	scouting2014/Save Data/Save-Master.ser
	scouting2014/nbproject/private/private.properties
Merge origin/master

Conflicts:
	scouting2014/Save Data/Save-Master.ser
	scouting2014/nbproject/private/private.properties
Merge origin/master