more snips
Merge remote-tracking branch 'origin/master'

Conflicts:
	UltiSnips/java.snippets
Updated java snippets, added junit setting
ew java snippets for constructors for auto creation of setter/getters
Reverted foreach java snippet
Removed some redundant imports
New xml snippets. Updated html and major update to java snippets by Tom Cammann.