New xml snippets. Updated html and major update to java snippets by Tom Cammann.
Merge branch 'master' of https://github.com/SirVer/ultisnips
improved java field complete
Merge branch 'master' of github.com:takac/ultisnips

Conflicts:
	UltiSnips/java.snippets
Merge branch 'master' of github.com:takac/ultisnips
Add Type completion for java