Detalles
Merge branch 'master' of https://github.com/Amorino/ez-audit

Conflicts:
app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_duplicates
app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_images
app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_markets
app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_matches

app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_people_trans
missions
app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_programs

app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_transmission
s

app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_transmission
s_markets

app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_transmission
s_matches

app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_transmission
s_vendors
app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_users
app/tmp/cache/models/myapp_cake_model_default_monitoreo_fox_vendors