Fixed layers mix mode 0
Removed generated config from git tracking
Merge branch 'client-dev' of github.com:theodi/colleen into client-dev