TODO
Merge branch 'master' of github.com:btlamp/lamp_android