Merge branch 'master' into power-ups
Merge branch 'master' into power-ups
specify modifier color in config
added modifier applied animation
added modifier removed animation
Merge branch 'power-ups'