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

Added waeponswitch to backbutton of controller

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

Controller.h

@@ -9,6 +9,7 @@ public:
     Vec3f ypr;
     Vec2f joystick;
     bool button, joystickButton, magnetSwitch;
+    bool lastButton, lastJoystickButton, lastMagetSwitch;
     int controllerId;
 
     void setConnected(bool connected);