Merge pull request #1 from iEcolab/master#21

lmarsan wants to merge 6 commits intoiEcolab:masteriEcolab/ecoinformatica_2015_2016:masterfrom

lmarsan:masterlmarsan/ecoinformatica_2015_2016:masterCopy head branch name to clipboard