Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop

.gitlab-ci.yml

@@ -6,7 +6,7 @@ linux:
     stage: build
     script:
         - ./build_deps.sh linux
-        - premake5 --cc=clang gmake
+        - premake5 --cc=gcc gmake
         - make clean
         - make -j 7
     tags:
@@ -19,7 +19,7 @@ release:
     stage: deploy
     script:
         - ./build_deps.sh linux
-        - premake5 --cc=clang gmake
+        - premake5 --cc=gcc gmake
         - make clean
         - make -j 7
         - tar -caf linux.tar.xz assets build
@@ -57,4 +57,4 @@ release_windows:
     tags:
         - Windows
     only:
-        - develop
+        - develop
\ No newline at end of file