oriolpujol/codename_uriel — pull request #201 by jvsanchez28 (2014-11-28 11:47:10+00:00)
Title: Merge into DEV by DEV TEAM C

Merge del sprint 4