Merge commit '7e730ff02dcc2edb49755944b0af440c49b1e238'
Merge commit '7e730ff02dcc2edb49755944b0af440c49b1e238'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Alpha_Project/web/indexTest2.xhtml