28.11.2014  WidgetDataTable
28.11.2014  WidgetDataTable
Merge remote-tracking branch 'origin/master'

Conflicts:
	douge/src/main/webapp/jsp/templates/index.html