Minor
Merge remote-tracking branch 'origin/master' into Hassan

Conflicts:
	_js/data-clean.js
improved user graphics
added user events. You can select which users to show