change pojo
Removed the Security configurations.
Merge branch 'master' of https://github.com/stoner30/canditu

Conflicts:
	cmapweb/target/classes/spring/applicationContext-jdbc.xml
	cmapweb/target/classes/spring/applicationContext.xml
...