Force line endings to Unix-style line endings for java and scala files
Merge branch 'master' into webadmin_refactoring

Conflicts:
	.gitattributes