e son mò
Merge branch 'master' of https://github.com/MarilisaPrivi/lastOne.git

Conflicts:
	11_07_14/src/net/viralpatel/spring3/controller/ContactController.java
	11_07_14/src/net/viralpatel/spring3/form/Contact.java
Merge branch 'master' of https://github.com/MarilisaPrivi/lastOne.git