Merge branch 'master' of https://github.com/lbochenek/urList

Conflicts:
	app/views/shared/_listing_form.html.erb
	app/views/users/_show_part.html.erb