boludeces
Merge remote-tracking branch 'origin/master'

Conflicts:
	TP-OPF5-VIEW/.settings/org.eclipse.wst.common.component