Bugfix: removing silverlight because it doesn't work
Merge branch 'dev'