merged master into develop.

src/test/resources/target_code/CMakeLists.txt

-#(c) https://github.com/MontiCore/monticore
 cmake_minimum_required(VERSION 3.5)
 set(CMAKE_CXX_STANDARD 14)
 

src/test/resources/target_code/CNNCreator_LeNet.py

-# (c) https://github.com/MontiCore/monticore  
 from caffe2.python import workspace, core, model_helper, brew, optimizer
 from caffe2.python.predictor import mobile_exporter
 from caffe2.proto import caffe2_pb2
@@ -92,6 +91,7 @@ class CNNCreator_LeNet:
 
     		return predictions_
 
+
     # this adds the loss and optimizer
     def add_training_operators(self, model, output, label, device_opts, loss, opt_type, base_learning_rate, policy, stepsize, epsilon, beta1, beta2, gamma, momentum) :
     	with core.DeviceScope(device_opts):

src/test/resources/target_code/CNNCreator_VGG16.py

-# (c) https://github.com/MontiCore/monticore  
 from caffe2.python import workspace, core, model_helper, brew, optimizer
 from caffe2.python.predictor import mobile_exporter
 from caffe2.proto import caffe2_pb2
@@ -138,6 +137,7 @@ class CNNCreator_VGG16:
 
     		return predictions_
 
+
     # this adds the loss and optimizer
     def add_training_operators(self, model, output, label, device_opts, loss, opt_type, base_learning_rate, policy, stepsize, epsilon, beta1, beta2, gamma, momentum) :
     	with core.DeviceScope(device_opts):

src/test/resources/target_code/CNNPredictor_LeNet.h

-/* (c) https://github.com/MontiCore/monticore */
 #ifndef CNNPREDICTOR_LENET
 #define CNNPREDICTOR_LENET
 

src/test/resources/target_code/CNNPredictor_VGG16.h

-/* (c) https://github.com/MontiCore/monticore */
 #ifndef CNNPREDICTOR_VGG16
 #define CNNPREDICTOR_VGG16
 

src/test/resources/target_code/CNNTrainer_emptyConfig.py

-# (c) https://github.com/MontiCore/monticore  
 from caffe2.python import workspace, core, model_helper, brew, optimizer
 from caffe2.python.predictor import mobile_exporter
 from caffe2.proto import caffe2_pb2

src/test/resources/target_code/CNNTrainer_fullConfig.py

-# (c) https://github.com/MontiCore/monticore  
 from caffe2.python import workspace, core, model_helper, brew, optimizer
 from caffe2.python.predictor import mobile_exporter
 from caffe2.proto import caffe2_pb2

src/test/resources/target_code/CNNTrainer_simpleConfig.py

-# (c) https://github.com/MontiCore/monticore  
 from caffe2.python import workspace, core, model_helper, brew, optimizer
 from caffe2.python.predictor import mobile_exporter
 from caffe2.proto import caffe2_pb2

src/test/resources/target_code/CNNTrainer_unsupportedConfig.py

-# (c) https://github.com/MontiCore/monticore  
 from caffe2.python import workspace, core, model_helper, brew, optimizer
 from caffe2.python.predictor import mobile_exporter
 from caffe2.proto import caffe2_pb2

src/test/resources/target_code/cmake/FindArmadillo.cmake

-# (c) https://github.com/MontiCore/monticore  
 # Automatically generated file
 #
 # - Try to find Armadillo
@@ -36,4 +35,4 @@ mark_as_advanced(
   )
 
 set(Armadillo_INCLUDE_DIRS ${Armadillo_INCLUDE_DIR})
-set(Armadillo_LIBRARIES ${Armadillo_LIBRARY})
+set(Armadillo_LIBRARIES ${Armadillo_LIBRARY})
\ No newline at end of file