some changes to get the app going with newest android studio... this will break you unless you upgrade to studio 1.0.1
Merge branch 'master' of https://github.com/lab11/iot-gateway