revertido
Merge branch 'master' of https://github.com/movimento-sem-terra/mst-image-service

Conflicts:
	app.rb