Merge pull request #60 from educloudalliance/master

Merging things up to data between branches.
Merge pull request #61 from educloudalliance/devel

Merge pull request #60 from educloudalliance/master