fix javadoc
Add javadoc output
file from robot 9/20
fix conditional commands. Also needs new WPILib
remove print statement from PDP current
Merge branch 'master' of
https://github.com/Beachbot330/Beachbot2014Beta.git

Conflicts:
	Beachbot2014Java/src/org/usfirst/frc330/Beachbot2014Java/subsystems/Pickup.java