CFY-660 add node type to ES
Merge branch 'develop' into feature/CFY-660-add-node-type

Conflicts:
	rest-service/manager_rest/blueprints_manager.py
	rest-service/manager_rest/es_storage_manager.py
	rest-service/manager_rest/file_storage_manager.py
	rest-service/manager_rest/resources.py
CFY-660 added node type and added an api for accessing node instances
Merge branch 'develop' into feature/CFY-660-add-node-type

Conflicts:
	rest-service/manager_rest/resources.py
CFY-660 travis with feature branches
CFY-660 fixed rest service unit tests
CFY-660 travis exp
CFY-660 travis exp
CFY-660 flake8, travis
CFY-660 flake8, travis
CFY-660 flake8, travis
CFY-660 removed debug code
CFY-660 review
Merge pull request #41 from cloudify-cosmo/feature/CFY-660-add-node-type

Feature/cfy 660 add node type
CFY-661 added list nodes api
CFY-661 added list nodes api
CFY-661 added node instances list
CFY-661 fixed swagger return types
CFY-661 fixed tests
CFY-661 fixed tests and flake8