Cleans up code that adds label to bean contextual links

Conflicts:
	tiles.module