Fixed some imports and changed the indentations
trying to fix things
Merge remote-tracking branch 'origin/master' into dashie

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