Merge branch 'gradle' of github:sieben/contiki into gradle

Conflicts:
	tools/cooja/src/main/java/org/contikios/cooja/plugins/VariableWatcher.java
Adding dependencie for jdesktop
Merge branch 'gradle' of github:sieben/contiki into gradle