Merge origin/DBStart

Conflicts:
	AirHockey/nbproject/project.properties
	AirHockey/src/components/Bat.java
	AirHockey/src/components/Game.java
	AirHockey/src/components/Puck.java
	AirHockey/src/gui/AirHockey.java
	AirHockey/src/gui/GameGUI.java
Signed-off-by:JBerkvens <MP.Berkvens@Gmail.com>