Testando os parsers(parte 1 de 2)
Testando os parsers(parte 1 de 2)
Merge
Merge branch 'master' of https://github.com/jeankirchner/representante

Conflicts:
	prax-logic-model/src/br/prax/model/logic/formatter/DoubleFormatter.java
	prax-logic-model/src/br/prax/model/logic/formatter/GridTypeFormatter.java
	prax-logic-model/src/br/prax/model/logic/parser/GridTypeParser.java
	prax-logic-model/src/br/prax/model/logic/validation/GridTypeValidation.java

merge