Commit [a2775a] master Maximize Restore History

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

Conflicts:
DBusJava/.gitignore
DBusJava/build.xml
DBusJava/src/main/java/org/freedesktop/dbus/test/cross_test_client.java
DBusJava/src/main/java/org/freedesktop/dbus/test/cross_test_server.java
EV3BumperCar/.gitignore
EV3BumperCar/build.xml
EV3Chart/.gitignore
EV3HelloWorld/.gitignore
EV3HelloWorld/build.xml
ev3classes/src/main/java/lejos/hardware/ButtonListener.java