set source/target versions to JDK 1.6, set source encoding
ignore eclipse files
Merge branch 'master' into maven

Conflicts:
	.gitignore