Merge branch 'master' into python3.3-support

Author: alnacle

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.1.0 - 2018-08-01
+--------------------
+
+Release 1.1.0
+
 1.0.0 - 2018-04-20
 --------------------
 

README.rst

@@ -262,10 +262,10 @@ Help
 
 Our `developer support team <https://developers.amadeus.com/support>`__ is here
 to help you.  You can find us on `StackOverflow
-<https://stackoverflow.com/questions/tagged/amadeus>`__, and `email
+<htps://stackoverflow.com/questions/tagged/amadeus>`__, and `email
 <mailto:developers@amadeus.com>`__.
 
-.. |Module Version| image:: https://badge.fury.io/py/amadeus.svg?v=1
+.. |Module Version| image:: https://badge.fury.io/py/amadeus.svg?id=py&type=6&v=1.1.0
    :target: https://pypi.org/project/amadeus/
 .. |Build Status| image:: http://img.shields.io/travis/amadeus4dev/amadeus-python.svg
    :target: http://travis-ci.org/amadeus4dev/amadeus-python

amadeus/version.py

@@ -1,2 +1,2 @@
-version_info = (1, 0, 0)
+version_info = (1, 1, 0)
 version = '.'.join(str(v) for v in version_info)