Merge commit '16141845cfe99454002aa2d1dba04bd047be7753' into develop

Conflicts:
	tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiButton.java
	tools/cooja/java/org/contikios/cooja/plugins/ScriptRunner.java