pre
Merge branch 'master' of https://github.com/mariano55555/aforecast

Conflicts:
	tmp/cache/models/aforecast_cake_model_default_aforecast_bottles_preforms
	tmp/cache/models/aforecast_cake_model_default_aforecast_categories
	tmp/cache/models/aforecast_cake_model_default_aforecast_customers
	tmp/cache/models/aforecast_cake_model_default_aforecast_customers_plants
	tmp/cache/models/aforecast_cake_model_default_aforecast_events
	tmp/cache/models/aforecast_cake_model_default_aforecast_list
	tmp/cache/models/aforecast_cake_model_default_aforecast_messages
	tmp/cache/models/aforecast_cake_model_default_aforecast_notes
	tmp/cache/models/aforecast_cake_model_default_aforecast_periods
	tmp/cache/models/aforecast_cake_model_default_aforecast_plants
	tmp/cache/models/aforecast_cake_model_default_aforecast_references
	tmp/cache/models/aforecast_cake_model_default_aforecast_sales
	tmp/cache/models/aforecast_cake_model_default_aforecast_spots_bases
	tmp/cache/models/aforecast_cake_model_default_aforecast_users
	tmp/cache/persistent/aforecast_cake_core_cake_dev_es-es
	tmp/cache/persistent/aforecast_cake_core_cake_es-es
	tmp/cache/persistent/aforecast_cake_core_default_es-es
	tmp/cache/persistent/aforecast_cake_core_file_map
	tmp/cache/persistent/aforecast_cake_core_method_cache