testing xtreemfs fix
updated nutshell generation scripts
Merge branch 'dev' of https://github.com/ConPaaS-team/conpaas into dev
typo correction
Merging dev
Merge branch 'dev' of https://github.com/ConPaaS-team/conpaas into dev