merged and fixed bug, some extra code included with merge, should be cleaned up
Merge branch 'automatic-stop' of github.com:TSEA56-2014-Grupp-1/Lagerrobot into automatic-stop