TEST BRANCH
jforemote version for 1.0
Merge branch 'master' into jforemote

Conflicts:
	.project
ingore
Merge branch 'jforemote'