Merge branch 'master' of git://git.code.sf.net/p/lejos/ev3

Conflicts:
	kernel/.gitignore