grnet/e-science — pull request #34 by nvrionis (2014-12-04 09:51:54+00:00)
Title: Develop

Sync with latest code from stories 167-168