Feature/test game sprint1

# Conflicts:
#	control/GameControl.java
#	main/Main.java
#	main/Window.java

Sprint 1 finished

control/GameControl.java

@@ -11,23 +11,29 @@ public class GameControl implements JoystickListener, ButtonListener{
 	
 	GameModel model;
 	GameView view;
+	GameStateManager gsm;
 	
-	public GameControl(GameModel model, GameView view)
+	public GameControl(GameModel model, GameView view,GameStateManager gsm)
 	{
 		this.model = model;
 		this.view = view;
+		this.gsm = gsm;
 	}
 
 	@Override
-	public void buttonPressed(ButtonEvent e) {
-		System.out.println(e.getButton().getButtonID());
+	public void buttonPressed(ButtonEvent e) {	
+//		System.out.println("Game control, button pressed: "+e.getButton().getButtonID());
+		gsm.currentState.buttonPressed(e);
 	}
 
 	@Override
-	public void buttonReleased(ButtonEvent e) {}
+	public void buttonReleased(ButtonEvent e) {	
+//		System.out.println("Game control, button released: "+e.getButton().getButtonID());
+		gsm.currentState.buttonReleased(e);
+	}
 
 	@Override
 	public void onJoystickMoved(JoystickEvent e) {
-
+		gsm.currentState.onJoystickMoved(e);
 	}
 }

control/GameStateManager.java

@@ -23,10 +23,10 @@ public class GameStateManager {
 	public void next() {
 		index++;
 		index %= gamestates.size();
+		currentState = gamestates.get(index);
 	}
 	
-	public void update(){
-		currentState = gamestates.get(index);
+	public void update(){		
 		currentState.update();
 	}
 }

control/joystick/JoystickHandler.java

@@ -50,7 +50,12 @@ public class JoystickHandler implements KeyListener{
                   public void handleGpioPinDigitalStateChangeEvent(GpioPinDigitalStateChangeEvent e) {
                 	  if(e.getState() == PinState.HIGH){
                 		  keyReleased(new KeyEvent(
-                				  		new java.awt.Component(){}, 
+                				  		new java.awt.Component(){
+
+											/**
+											 * 
+											 */
+											private static final long serialVersionUID = 1L;}, 
                 				  		KeyEvent.KEY_RELEASED, 
                 				  		System.nanoTime(), 
                 				  		0, 
@@ -60,7 +65,12 @@ public class JoystickHandler implements KeyListener{
                 		  System.out.println(e.getPin().getName() + " Released");
                 	  }else{
                 		  keyPressed(new KeyEvent(
-          				  		new java.awt.Component(){}, 
+          				  		new java.awt.Component(){
+
+									/**
+									 * 
+									 */
+									private static final long serialVersionUID = 1L;}, 
           				  		KeyEvent.KEY_PRESSED, 
           				  		System.nanoTime(), 
           				  		0,