Merge origin/test into test

Conflicts:
	robotCode/src/edu/wpi/first/wpilibj/templates/Utils.java
Deleted nbproject directory
for merge
Merge branch 'master' of https://github.com/FRCTeam1719/2013Java

Conflicts:
	robotCode/nbproject/private/private.xml
	robotCode/nbproject/project.bak.xml
	robotCode/nbproject/project.xml
	robotCode/src/edu/wpi/first/wpilibj/templates/Devices.java