fadsfsaf
Merge branch 'master' of https://github.com/SilvioMonnerat/FeiraoCury

Conflicts:
	images/Thumbs.db
	panel/Thumbs.db
	panel/campo-grande/Thumbs.db
	panel/engenho-novo/Thumbs.db
	panel/jacarepagua/Thumbs.db
	panel/pavuna/Thumbs.db
	panel/rocha-miranda/Thumbs.db
	panel/sao-goncalo/Thumbs.db
	panel/tomas-coelho/Thumbs.db