Jquery/java: info trailere
Merge branch 'master' of https://github.com/sanitec/nettavis

Conflicts:
	nettavis/nettavis.csproj
intellisense for jquery