Update from pioneer master

Remeber to do this locally on you pc

git checkout master
git remote update origin
git merge origin/master

after every merge into our master