Merges branch sol006 into master

Change-Id: Idb5eb93eeab7e8696e097ee0c2e1cf79ea054f20
Signed-off-by: garciaale <agarcia@whitestack.com>
diff --git a/setup.py b/setup.py
index 6bf023e..2140468 100644
--- a/setup.py
+++ b/setup.py
@@ -28,12 +28,10 @@
     description=_description,
     license='Apache 2',
     install_requires=[
-        'Click', 'prettytable<=1.0.1', 'pyyaml', 'pycurl', 'python-magic',
+        'Click', 'prettytable', 'pyyaml', 'pycurl', 'python-magic',
         'jinja2', 'osm-im', 'verboselogs', 'packaging', 'ruamel.yaml',
-        'requests'
-    ],
-    dependency_links=[
-        'git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im',
+        'requests',
+        'osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im',
     ],
     setup_requires=['setuptools-version-command'],
     test_suite='nose.collector',