ciao
ciao
ciao
ciao
Merge remote-tracking branch 'origin/master'

Conflicts:
	BeerApplication/WebContent/index_ajax.html