modificar jre de 1.8 para 1.7
remover espaço
Merge branch 'master' of
https://github.com/eduardovendruscolo/test-spring-mvc.git

Conflicts:
	testeMvc/.classpath
	testeMvc/src/br/com/caelum/tarefas/controller/OlaMundoController.java
	testeMvc/target/maven-archiver/pom.properties
	testeMvc/target/testeMvc-0.0.1-SNAPSHOT.war