confidencesun/marmotta — pull request #2 by confidencesun (2014-05-06 09:33:36+00:00)
Title: Confidencesun-from-develop-to-MARMOTTA-444

merge from confidencesun/develop to MARMOTTA-444