Edit widget
Merge remote-tracking branch 'origin/master'

Conflicts:
	douge/src/main/java/lv/javaguru/java2/domain/WidgetType.java