a bunch of smaller changes
Merge branch 'master' of https://github.com/silviujingoi/smartsensors-mobisys2014