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

Added support for second controller
# Conflicts:
#	CrystalPoint.cpp
#	CrystalPoint.h
#	CrystalPoint.vcxproj
#	CrystalPoint.vcxproj.filters

Weapon.cpp

@@ -71,14 +71,14 @@ void Weapon::draw(){
         weaponmodel->draw();
 
         //Test code for finding anker point
-/*        glColor3ub(255, 255, 0);
+        glColor3ub(255, 255, 0);
         glTranslatef(ankerPoint.x, ankerPoint.y, ankerPoint.z);
         glBegin(GL_LINES);
         glVertex2f(0, 4);
         glVertex2f(0, -4);
         glVertex2f(4, 0);
         glVertex2f(-4, 0);
-        glEnd();*/
+        glEnd();
 
         glPopMatrix();