Merge remote-tracking branch 'bbnova/master'
Small cleanup
Updated Silverlight controls with changes made to WPF

Fixed icon content bug in silverlight