Development

Merging the Development branch just before the IBM Watson demo.