view minor change
Merge remote-tracking branch 'origin/master'
minor flow fix
minor flow fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/flows/main/gameplay/view.xhtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/flows/main/gameplay/view.xhtml
Merge remote-tracking branch 'origin/master'