fixing small bugus on transition
Merge branch 'master' of https://github.com/ucbl/DataConfMashup