uncommented key switches added image manager
Merge branch 'master' of https://github.com/rydrman/DS3-WorkInProgress