Merge branch 'feature/fix_edge_controller' into development

Author: David Baum

ui/index.html

@@ -85,7 +85,7 @@
 	<script type="text/javascript" src="scripts/Email/EmailController.js"></script>
 	<script type="text/javascript" src="scripts/Menu/MenuController.js"></script>
 	<script type="text/javascript" src="scripts/PatternConnector/PatternConnectorController.js"></script>
-	<script type="text/javascript" src="scripts/EdgeConfigurator/EdgeConfiguratorController.js"></script>
+	<script type="text/javascript" src="scripts/Configuration/ConfigurationController.js"></script>
 	<script type="text/javascript" src="scripts/Legend/LegendController.js"></script>
 	<script type="text/javascript" src="scripts/Systeminfo/SysteminfoController.js"></script>