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

Conflicts:
	app/Controller/ReportsController.php
	app/View/Rents/index.ctp
	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