create widget,page,static
create widget,page,static
Merge remote-tracking branch 'origin/master'

Conflicts:
	controller.js
ss