Syncing my repo
Merge branch 'develop' of https://github.com/VFoteinos/e-science into develop
Fix to delete the master VM root_password file after selenium tests that create VMs
Merge branch 'develop' of https://github.com/ioannisstenos/e-science into develop