sound updates
Merge branch 'client-dev' of https://github.com/theodi/colleen into client-dev

# By Thijs Koerselman (2) and others
# Via Thijs Koerselman (2) and gavin (1)
* 'client-dev' of https://github.com/theodi/colleen:
  Removed generated config from git tracking
  Fixed layers mix mode 0
  #gui div parent of buttons
  Display controls on project change
  Added pop-over web page interaction

Conflicts:
	client/js/rules.js
updates for local working
Merge branch 'client-dev' of https://github.com/theodi/colleen into client-dev

# By gavin
# Via gavin
* 'client-dev' of https://github.com/theodi/colleen:
  Generate sound_config.js from using compile_sound_config.js

Conflicts:
	client/data/sound_config.json
updates to war_diary, plankton, wise, notes_from nature