Merge branch 'master' of https://github.com/smariani/Seagull

Conflicts:
app/tmp/cache/models/myapp_cake_model_default_seagull_list
app/tmp/cache/models/myapp_cake_model_default_seagull_portate
app/tmp/cache/models/myapp_cake_model_default_seagull_users
app/tmp/cache/persistent/myapp_cake_core_cake_dev_it
app/tmp/cache/persistent/myapp_cake_core_cake_it
app/tmp/cache/persistent/myapp_cake_core_default_it
app/tmp/cache/persistent/myapp_cake_core_file_map
app/tmp/cache/persistent/myapp_cake_core_method_cache
app/tmp/logs/error.log
Non voglio committare