Merge branch 'develop' into request_logging

Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py

1 files changed, 6 insertions, 2 deletions

diff --git a/webclient/app.js b/syweb/webclient/app.js

index 099e2170a0..9e5b85820d 100644
--- a/webclient/app.js
+++ b/syweb/webclient/app.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 var matrixWebClient = angular.module('matrixWebClient', [
     'ngRoute',
-    'ngAnimate',
     'MatrixWebClientController',
     'LoginController',
     'RegisterController',
@@ -30,8 +29,13 @@ var matrixWebClient = angular.module('matrixWebClient', [
     'MatrixCall',
     'eventStreamService',
     'eventHandlerService',
+    'notificationService',
+    'recentsService',
+    'modelService',
+    'commandsService',
     'infinite-scroll',
-    'ui.bootstrap'
+    'ui.bootstrap',
+    'monospaced.elastic'
 ]);
 
 matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider',