widgets text and distinct
Merge branch 'layout' of https://github.com/avelino/mining into layout

Conflicts:
	assets/app/views/element.html