fixing compilation issues

git-svn-id: svn://ciws.iasfbo.inaf.it/Ciws/DAS/trunk@52 2a20093d-90dd-4be6-b9fe-e465d393256e
fixing compilation issues - conflicts

git-svn-id: svn://ciws.iasfbo.inaf.it/Ciws/DAS/trunk@53 2a20093d-90dd-4be6-b9fe-e465d393256e
Merge branch 'master' of https://github.com/mfrailis/DAS

git-svn-id: svn://ciws.iasfbo.inaf.it/Ciws/DAS/trunk@54 2a20093d-90dd-4be6-b9fe-e465d393256e
trying svn commit

git-svn-id: svn://ciws.iasfbo.inaf.it/Ciws/DAS/trunk@55 2a20093d-90dd-4be6-b9fe-e465d393256e
github resolved conflict