Merge branch 'develop' into personal

requirements.txt

@@ -1,24 +1,25 @@
+Babel>=1.3
+Flask-Babel==0.11.1
+Flask-Login>=0.3.2
+Flask-Principal>=0.3.2
+Flask>=0.11
+gevent==1.2.1
 google-api-python-client==1.6.1
+greenlet==0.4.12
 httplib2==0.9.2
+iso-639>=0.4.5
 lxml==3.7.2
 oauth2client==4.0.0
-pyasn1==0.1.9
 pyasn1-modules==0.0.8
+pyasn1==0.1.9
 PyDrive==1.3.1
-PyYAML==3.12
-rsa==3.4.2
-six==1.10.0
-uritemplate==3.0.0
-Babel>=1.3
-Flask>=0.11
-Flask-Babel==0.11.1
-Flask-Login>=0.3.2
-Flask-Principal>=0.3.2
-iso-639>=0.4.5
 PyPDF2==1.26.0
 pytz>=2016.10
+PyYAML==3.12
 requests>=2.11.1
+rsa==3.4.2
+six==1.10.0
 SQLAlchemy>=0.8.4
 tornado>=4.1
-Wand>=0.4.4
-#future
+uritemplate==3.0.0
+Wand>=0.4.4