cambios_18_11_2014
Merge branch 'masbase2'