Merge branch 'master' of https://github.com/vinizinmoraes/projeto-final

Conflicts:
	app/Controller/ClientsController.php
	app/View/Clients/add.ctp
	app/View/Clients/edit.ctp
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_acos
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_aros
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_aros_acos
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_clients
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_list
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_suppliers
	app/tmp/cache/models/myapp_cake_model_default_svdl_groups
	app/tmp/cache/models/myapp_cake_model_default_svdl_users
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_pt-br
	app/tmp/cache/persistent/myapp_cake_core_cake_pt-br
	app/tmp/cache/persistent/myapp_cake_core_default_pt-br
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
Merge branch 'master' of https://github.com/vinizinmoraes/projeto-final

Conflicts:
	app/Controller/ClientsController.php
	app/View/Clients/add.ctp
	app/View/Clients/edit.ctp
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_acos
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_aros
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_aros_acos
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_clients
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_list
	app/tmp/cache/models/myapp_cake_model_default_felipebdesigner_suppliers
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_pt-br
	app/tmp/cache/persistent/myapp_cake_core_cake_pt-br
	app/tmp/cache/persistent/myapp_cake_core_default_pt-br
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log