Merge branch 'master' of C:\Users\Ferrari\PycharmProjects\sabia2 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	sabia2/settings.pyc
melhorado o layout da revisão e detalhes