removed debian files from master
Merge branch 'master' into debian