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

Conflicts:
	frameworks/Python/AsyncIO/aiohttp.web/requirements.txt

frameworks/Python/AsyncIO/aiohttp.web/requirements.txt

@@ -1,18 +1,14 @@
-aiohttp==0.16.3
-aiohttp-jinja2==0.4.2
-aiopg==0.7.0
-api-hour==0.6.2
-asyncio-redis==0.13.4
-chardet==2.3.0
-gunicorn==19.3.0
-hiredis==0.2.0
 Jinja2==2.7.3
 MarkupSafe==0.23
-piprot==0.9.1
-psycopg2==2.6
 PyYAML==3.11
-requests==2.7.0
-requests-futures==0.9.5
+aiohttp==0.13.1
+aiohttp-jinja2==0.0.2
+aiopg==0.5.2
+api-hour==0.6.1
+asyncio-redis==0.13.4
+gunicorn==19.1.1
+hiredis==0.1.6
+psycopg2==2.5.4
 setproctitle==1.1.8
-six==1.9.0
+six==1.8.0
 ujson==1.33