Commit de Integracion 10/07/2014
Merge origin/master
Commit de Integracion 10/07/2014