biki branch
Merge branch 'biki'

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/myproject/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/myproject/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv