Added user badge icons
Merge branch 'master' of https://github.com/v0idness/tweeporter

Conflicts:
	app/views/events/_evlist.html.erb