Updates branch master with sol006 branch, introducing new SOL006 model classes

Change-Id: Ica385dd2e44a0e72561b450554f7fa9e450f08c9
Signed-off-by: garciaale <agarcia@whitestack.com>
diff --git a/.gitignore b/.gitignore
index 893f025..f1e4221 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,8 @@
 osm_im/nst.py
 osm_im/nsi.py
 osm_im/osm.yaml
+osm_im/etsi-nfv-nsd.py
+osm_im/etsi-nfv-vnfd.py
 
 #Pyang and other tools' folders
 pyangbind