Xml stupidity and some updated Javadocs
Merge branch 'master' of https://github.com/SunnyBat/FrcAerialAssist

Conflicts:
	2014RobotCode/src/edu/wpi/first/wpilibj/templates/subsystems/NetworkTables.java