Merge branch 'core' of ssh://plrg.eecs.uci.edu/home/git/iotcloud into core