Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider

res/templates/notif.html

res/templates/notif.txt

synapse/appservice/scheduler.py

synapse/handlers/__init__.py

synapse/handlers/appservice.py

synapse/handlers/directory.py

synapse/notifier.py

synapse/push/bulk_push_rule_evaluator.py

synapse/server.py

synapse/storage/push_rule.py

synapse/storage/schema/delta/30/as_users.py

tests/handlers/test_appservice.py