Merge branch 'develop' of github.com:potassco/plasp into develop

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "tests/catch"]
-	path = tests/catch
-	url = https://github.com/philsquared/Catch.git
+[submodule "lib/catch"]
+	path = lib/catch
+	url = https://github.com/philsquared/Catch

tests/CMakeLists.txt

@@ -5,7 +5,7 @@ file(GLOB core_sources "*.cpp")
 include_directories(
 	${Boost_INCLUDE_DIRS}
 	${PROJECT_SOURCE_DIR}/include
-	catch/single_include
+	${PROJECT_SOURCE_DIR}/lib/catch/single_include
 )
 
 set(libraries