more snips
Merge branch 't-master' into t-remote

Conflicts:
	UltiSnips/java.snippets
	UltiSnips/xml.snippets
updated camelCasing variables
MAD SNIPS
improved java snips using lots of python