Robotathon 2015 - Scouting Server Update from Github Conference Session
update
Updated Client to Handle Multiple Connections
Merge remote-tracking branch 'origin/master'

Conflicts:
	Robotics Scouting Client/.classpath
	Robotics Scouting
Client/src/org/petoskeypaladins/scouting/client/Controller.java
	Robotics Scouting
Client/src/org/petoskeypaladins/scouting/client/xml/Application.fxml
	Robotics Scouting Server/.classpath