Javadoc II
Merge remote-tracking branch 'origin/master'

Conflicts:
	Databasprojektet/build/classes/databasprojektet/MainWindow.class
	Databasprojektet/nbproject/genfiles.properties
	Databasprojektet/nbproject/private/private.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	Databasprojektet/build/classes/databasprojektet/MainWindow.class
	Databasprojektet/nbproject/genfiles.properties
	Databasprojektet/nbproject/private/private.xml