Commit build.xml
Commit build.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/index.jsp
Commit persistence.xml