u
j
d
d
hh
Merge remote-tracking branch 'origin/master'

Conflicts:
	brp/.project
	brp/.settings/org.eclipse.wst.common.component