Adding sbt environment configuration
including previous environment
merging origin/master, 1 conflict