teste2
Merge remote-tracking branch 'origin/master'

Conflicts:
	logRecife/.gitignore
	logRecife/src/br/ufrpe/logrecife/DialogFormFragment.java