Add photo e modificacoes nas permissoes usuario
Add photo e modificacoes nas permissoes usuario
Merge branch 'master' of https://github.com/lucasvs/desafio

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_desafio_list
	app/tmp/cache/models/myapp_cake_model_default_desafio_users
	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