Merge remote-tracking branch 'origin/develope' into develope

# Conflicts:
#	demo/routes.py
#	demo/views/frontend.py
#	entry.py

demo/routes.py

@@ -1,7 +1,6 @@
 from .views import frontend
 import aiohttp
 
-
 def setup_routes(app):
-    app.router.add_routes(
-        [aiohttp.web.get('/', frontend.index), aiohttp.web.post('/button-clicked', frontend.button_clicked)])
+  app.router.add_routes([aiohttp.web.get('/', frontend.index), aiohttp.web.post('/button-clicked', frontend.button_clicked)])
+  

demo/views/frontend.py

@@ -3,10 +3,11 @@ import aiohttp
 from aiohttp_jinja2 import template
 
 
+
 @template('index.html')
 async def index(request):
     return {}
 
 
 async def button_clicked(request):
-    return aiohttp.web.json_response({'result': 'Button was clicked'})
+    return aiohttp.web.json_response({'result':'Button was clicked'})

entry.py

@@ -1,7 +1,14 @@
 import aiohttp
 from demo import create_app
 
+
+
+
+
 app = create_app()
 
+
+
+
 if __name__ == '__main__':
-    aiohttp.web.run_app(app)
+  aiohttp.web.run_app(app)