resolve conflict.
Merge branch 'master' of https://github.com/fredfeng/Scuba
resolve conflict again
Merge branch 'master' of https://github.com/fredfeng/Scuba
instantiating constraint for virtual calls