Felipphe Triviño' 02-05-2014
Merge origin/Release-Version-1.0
Victor Algarin 05/05/2014 Intento a Master
Merge Desarrollo-Victor/master into Desarrollo
Victor Algarin 05/05/2014 Intento a Masterr
Merge Desarrollo-Victor/Desarrollo into Desarrollo