Arreglos al dev
Merge branch 'dev' of https://github.com/ECCI-IS-2014/GOA into dev