Merge branch 'master' into dev

Parth Shah · Parth Shah · commit 30c5200530bd · 2017-02-02T12:28:00.000-08:00
diff --git a/config/production.json b/config/production.json
@@ -10,5 +10,5 @@
   "SLACK_CHANNEL_MANAGERS": "#connect",
   "SLACK_CHANNEL_COPILOTS": "#connect-copilots",
 
-  "API_BASE_URL": "http://api.topcoder-dev.com"
+  "API_BASE_URL": "http://api.topcoder.com"
 }

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@`
`10`	`10`	`"SLACK_CHANNEL_MANAGERS": "#connect",`
`11`	`11`	`"SLACK_CHANNEL_COPILOTS": "#connect-copilots",`
`12`	`12`
`13`		`- "API_BASE_URL": "http://api.topcoder-dev.com"`
	`13`	`+ "API_BASE_URL": "http://api.topcoder.com"`
`14`	`14`	`}`