-merging
Merge branch 'master' of https://github.com/ucbl/DataConfMashup
 graph and qrscan fixes