github resolved conflict

git-svn-id: svn://ciws.iasfbo.inaf.it/Ciws/DAS/trunk@56 2a20093d-90dd-4be6-b9fe-e465d393256e
bad marge fixed

git-svn-id: svn://ciws.iasfbo.inaf.it/Ciws/DAS/trunk@57 2a20093d-90dd-4be6-b9fe-e465d393256e
Merge https://github.com/mfrailis/DAS
resolving bad merge 2