all layouts are new and shiny
Merge branch 'master' of https://github.com/iBot/WP_SHC
refactor the ButtonListenerFactory.java

corridorLightLayout should working now