type on dblogging
Merge branch 'master' of github.com:bachelor-2014/code
Added headless dropletdetector
Merge branch 'master' of github.com:bachelor-2014/code into cvcamera