java syntax
Merge branch 'master' into imag

Conflicts:
	vimrc