new file
Merge branch 'master' into jianw_dev

Conflicts:
	.settings/org.eclipse.jdt.core.prefs