Merge branch 'develop' into develop

Author: 24santoshr

build.sbt

@@ -1,3 +1,4 @@
+import com.typesafe.config._
 
 name := "delphi-management"
 
@@ -14,8 +15,12 @@ lazy val management = (project in file(".")).enablePlugins(SbtWeb).enablePlugins
                                           buildInfoPackage := "de.upb.cs.swt.delphi.management"
                                         )
 
-PlayKeys.devSettings := Seq("play.server.http.port" -> "8082")
+val conf = ConfigFactory.parseFile(new File("conf/application.conf")).resolve()
+val appPortManagement    = conf.getString("app.portManagement")
 
+PlayKeys.devSettings := Seq(
+    "play.server.http.port" -> appPortManagement
+)     
 pipelineStages := Seq(digest,gzip)
 
 resolvers += Resolver.sonatypeRepo("snapshots")

conf/application.conf

@@ -355,4 +355,6 @@ play.i18n.langs = [ "en" ]
 play.modules.enabled += "module.Module"
 play.http.errorHandler = "utils.ErrorHandler"
 
+app.portManagement = 8083
+
 include "silhouette.conf"