updating bower.json:
fixing dispute tests
Merge branch 'otp-stuff'