Merge remote-tracking branch 'origin/developer' into feature/weaponCollision

Added waeponswitch to backbutton of controller

# Conflicts:
#	Enemy.cpp
#	Player.cpp
#	Weapon.cpp
#	Weapon.h

ControllerHandler.cpp

@@ -120,6 +120,11 @@ void ControllerHandler::commandControllerData(std::vector<std::string> data) {
 
             c->joystick.x = std::stoi(data[2])/2000.0f;
             c->joystick.y = std::stoi(data[3])/2000.0f;
+
+            c->lastButton = c->button;
+            c->lastJoystickButton = c->joystickButton;
+            c->lastMagetSwitch = c->magnetSwitch;
+
             c->joystickButton = !(data[4] == "0");
             c->button = !(data[8] == "0");
             c->magnetSwitch = !(data[9] == "0");