modal
Modal done, konsequences started
Modal consequences
Merge remote-tracking branch 'origin/Eco-feedback'
Merge remote-tracking branch 'origin/master' into player