Add Test Code
Merge branch 'develop' into feature/real_esss

Conflicts:
	pom.xml
	src/main/resources/spring/applicationContext.xml
Version 1 for ajax jquery code
Test OK For json mapping