device and location
Merge branch 'master' of github.com:mauryquijada/aware