merge master
removed widgets folder, removed reference on xtyle.js file