version medio final 1ra iteracion

merge ccaballero-20140411 into master