new
Merge remote-tracking branch 'origin/master'

Conflicts:
	eclipse/K3Sample/bin/.gitignore