merged master onto senslab2, manually solved conflicts in setup.py