grrrr
Merge branch 'master'
pulled back functionality to pre- three headed monkey touch
monitor button combat hardening & some icons change
Merge branch 'master'
1.1