[informe 20140501 jmejia]
Merge branch 'master' of https://github.com/colectivovirtual/sitis-documentation