Merge pull request #814 from AnalyticalGraphicsInc/widgetCleanup

Widget API cleanup
Merge branch 'master' into viewer