oriolpujol/codename_uriel — pull request #99 by jvsanchez28 (2014-10-24 08:38:42+00:00)
Title: Dev team C merge with DEV

Merge de la rama DEV TEAM C del sprint 2 hacia la DEV