Merge branch 'master' into develop

HISTORY.md

@@ -1,5 +1,13 @@
 # History
 
+## 0.48.2, 2016-Dec-20 
+
+- Add button to refresh aouth services
+- Fix download on electron
+- Fix issue creating users with username from OAuth
+- Fix message when username field not exists in OAuth data
+- Fix OAuth global variable
+
 ## 0.48.1, 2016-Dec-13 - Now uses NodeJS 4.7.0
 
 - Fix integration payload JSON.parse 

app.json

@@ -6,7 +6,7 @@
   "keywords": ["meteor", "social", "community", "chat"],
   "website": "https://rocket.chat",
   "env": {
-    "BUILDPACK_URL": "https://github.com/RocketChat/heroku-buildpack-meteor.git",
+    "BUILDPACK_URL": "https://github.com/RocketChat/meteor-buildpack-horse.git",
     "HEROKU_APP_NAME": {
       "description": "Please re-enter your App Name from the top.",
       "required": true

server/startup/migrations/v071.1.js

@@ -0,0 +1,6 @@
+RocketChat.Migrations.add({
+	version: 71.1,
+	up: function() {
+		ServiceConfiguration.configurations.remove({});
+	}
+});