Commit_20140504
Commit_20140516
Merge branch 'master' of https://github.com/DataBrainbr/comparadorpreco

Conflicts:

	databrain_dao/src/main/java/br/com/databrain/dao/mysql/ConexaoMySql.java

	databrain_dao/target/classes/br/com/databrain/dao/mysql/ConexaoMySql.class

	databrain_dao/target/surefire-reports/br.com.databrain.dao.mysql.AppTest.txt