Merge master changes to develop

pom.xml

...narch/gluongenerator/CNNArch2GluonTemplateController.java

src/main/resources/templates/gluon/CNNSupervisedTrainer.ftl

src/main/resources/templates/gluon/CNNTrainer.ftl

src/main/resources/templates/gluon/elements/Output.ftl

...s/templates/gluon/reinforcement/params/DqnAgentParams.ftl

src/test/resources/target_code/CNNNet_Alexnet.py

...st/resources/target_code/CNNNet_CifarClassifierNetwork.py

src/test/resources/target_code/CNNNet_VGG16.py

...est/resources/target_code/CNNSupervisedTrainer_Alexnet.py

...arget_code/CNNSupervisedTrainer_CifarClassifierNetwork.py

src/test/resources/target_code/CNNSupervisedTrainer_VGG16.py

src/test/resources/target_code/CNNTrainer_fullConfig.py

src/test/resources/target_code/CNNTrainer_simpleConfig.py

...e/ReinforcementConfig1/CNNTrainer_reinforcementConfig1.py

...e/ReinforcementConfig2/CNNTrainer_reinforcementConfig2.py

...e/ReinforcementConfig3/CNNTrainer_reinforcementConfig3.py

..._code/ddpg/reinforcement_learning/CNNNet_CriticNetwork.py

...os-ddpg/reinforcement_learning/CNNNet_RosCriticNetwork.py

src/test/resources/valid_tests/FullConfig.cnnt