...
Merge branch 'master' of github.com:turing2/SmartHouse
add log4j