support for temperature
fix color
merge
config
update to have touch
counters
Merge remote-tracking branch 'origin/master'
Merge branch 'my'
Merge branch 'master' of github.com:jonnyzzz/iot2014
move
Merge remote-tracking branch 'origin/master'