Ajax pettitons
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	src/main/dynamic-configuration/WEB-INF/web.xml
	src/main/java/edu/uoc/pelp/actions/HomeAction.java
	src/main/webapp/jsp/home.jsp
fix
AJAX FIX