padrao
Merge branch 'master' of https://github.com/josofm/unieventos

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_pt-br
	app/tmp/cache/persistent/myapp_cake_core_file_map