local scan mods
Merge branch 'refs/heads/master' into iscan_branch

Conflicts:
	.classpath
	.gitignore
	demo/.classpath
	tests/.classpath
	tests/project.properties
Merge branch 'refs/heads/iscan_branch'