Merge origin/master

Conflicts:
	nbproject/project.xml
	src/edu/wpi/first/wpilibj/templates/RobotTemplate.java