configuration, jumping between flows is not working.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/flows/main/player-config/flow.xml