2014 Update
Merge branch 'upstream'

Conflicts:
	ADXL345_I2C.cpp
	ADXL345_I2C.h
	ADXL345_SPI.cpp
	ADXL345_SPI.h
	AnalogChannel.cpp
	AnalogModule.cpp
	AnalogModule.h
	CANJaguar.cpp
	CANJaguar.h
	DoubleSolenoid.cpp
	DriverStation.cpp
	DriverStation.h
	Encoder.cpp
	GearTooth.h
	Gyro.cpp
	Gyro.h
	PWM.cpp
	RobotBase.cpp
	Servo.cpp
	Timer.cpp
	Ultrasonic.cpp
	Ultrasonic.h
	networktables/NetworkTable.cpp
	networktables/NetworkTable.h
	networktables2/server/ServerConnectionList.cpp
	networktables2/stream/FDIOStream.cpp
	networktables2/type/ArrayEntryType.h
	networktables2/type/ComplexEntryType.h
	networktables2/type/NetworkTableEntryType.h
	tables/ITableListener.h
Merge branch 'master' of github.com:rbmj/wpilib