Fix typo
Change cloud security group model

nc-141
Fix instance security group model

nc-141
Fix bug in license.rst

nc-141
Merge branch 'develop' into feature/nc-141

Conflicts:
	nodeconductor/cloud/tests/test_scenarios.py
	nodeconductor/iaas/tests/unittests/test_serializers.py
Change instance security groups tests, model and serializer

nc-141
Add tests for cloud security groups

nc-141
Extend random createsampledata

nc-141
Add documentation for security group

nc-141
Change docs for instance security groups

nc-141
Fix serializer class and tests for instance security groups

nc-141
Merge branch 'develop' into feature/nc-141

Conflicts:
	nodeconductor/testdata/management/commands/createsampledata.py
Merge branch 'develop' of code.opennodecloud.com:nodeconductor/nodeconductor into feature/nc-141

Conflicts:
	docs/guide/structure.rst
Add test on PUT
Fix bugs

nc-141
Merge branch 'feature/nc-141' of code.opennodecloud.com:nodeconductor/nodeconductor into feature/nc-141
Merge branch 'develop' into feature/nc-141

Conflicts:
	nodeconductor/cloud/models.py
	nodeconductor/cloud/tests/factories.py
	nodeconductor/cloud/urls.py
	nodeconductor/testdata/management/commands/createsampledata.py
Add instance security groups to createsampledata

nc-141
Fixed dependencies: python-keystoneclient 0.11.2 is failing with `ImportError: No module named pbr.core`
Merge branch 'develop' of code.opennodecloud.com:nodeconductor/nodeconductor into feature/nc-141