Extended IaaS and cloud models.

- NC-37
- Extended Template/Instance with extra fields
- Adapted factories
Remove license_type from Image model
Relax version requirement for six
Merge branch 'feature/nc-103' into 'develop'

Feature/nc-103

- Additional fields for the IaaS/Cloud models
- Extensions to serializer