Activo periodo 201313
Merge remote-tracking branch 'origin/master'