Fixed bug with commented out code
Merge branch 'master' of https://github.com/OPENi-ict/cloudlet-platform