24nov
Merge branch 'spring_int_fix' of https://github.com/newkek/codelicious into spring_int_fix

Conflicts:
	WebContent/template.xhtml
	src/mbeans/SearchContact.java