premerge
Merge branch 'master' of github.com:nordmoen/EiT-trekantrobot
cleanified actionClick a little bit