Merge branch 'ev3dev-wheezy' into ev3dev-jessie

Conflicts:
	Makefile
	drivers/legoev3/ev3_tacho_motor.c
	drivers/legoev3/tacho_motor_class.c