Merge pull request #1 from Ericsson/master

update my master

Author: Raja Maragani

src/main/java/com/ericsson/ei/frontend/EIRequestsController.java

@@ -128,7 +128,7 @@ public String getEIBackendSubscriptionAddress() {
      * 
      */
     @CrossOrigin
-    @RequestMapping(value = {"/subscriptions", "/subscriptions/*", "/information" }, method = RequestMethod.GET)
+    @RequestMapping(value = {"/subscriptions", "/subscriptions/*", "/information", "/download/subscriptiontemplate"}, method = RequestMethod.GET)
     public ResponseEntity<String> getRequests(Model model, HttpServletRequest request) {
     	String eiBackendAddressSuffix = request.getServletPath();
     	String newRequestUrl = getEIBackendSubscriptionAddress() + eiBackendAddressSuffix;

src/main/java/com/ericsson/ei/frontend/SubscriptionFilesController.java

@@ -20,9 +20,6 @@ ei.backendServerPort=8090
 ei.backendContextPath=
 ei.useSecureHttp=false
 
-###### Subscription Template file ########
-ei.subscriptionFilePath=subscriptions/subscriptionsTemplate.json
-
 ###### EI Documentation Link Url ##########
 ei.eiffelDocumentationUrls={ "EI GitHub": "https://github.com/Ericsson/eiffel-intelligence-frontend",\
                              "Eiffel Github": "https://github.com/Ericsson/eiffel",\