Merge branch 'core' of ssh://plrg.eecs.uci.edu/home/git/iotcloud into core
authorrtrimana <rtrimana@uci.edu>
Sat, 12 May 2018 21:07:00 +0000 (14:07 -0700)
committerrtrimana <rtrimana@uci.edu>
Sat, 12 May 2018 21:07:00 +0000 (14:07 -0700)

Trivial merge