CLOUDIFY-2573 set node lifecycle states
CLOUDIFY-2573 move reset_data from while loop
Merge branch 'develop' into feature/CLOUDIFY-2573-node-state-progress
CLOUDIFY-2568 fixed get blueprint by id bug (elasticsearch 'fields' doesnt support non-leaf nodes apparently); added test_get_blueprint to testenv
CLOUDIFY-2573 set node state according to lifecycle progress
Merge pull request #180 from CloudifySource/feature/CLOUDIFY-2568-store-blueprint-source-in-storage

CLOUDIFY-2568 fixed get blueprint by id bug (elasticsearch 'fields' does...
CLOUDIFY-2573 testenv es delete
Merge branch 'develop' into feature/CLOUDIFY-2573-node-state-progress

Conflicts:
	workflows/workflow_tests/test_workflow.py
CLOUDIFY-2402 Added a testenv test for the new plugin get_resource feature; moved blueprints in the fileserver to be stored under '/blueprints' directory instead of under the root
CLOUDIFY-2573 es delete query
CLOUDIFY-2573 remove elasticsearch index if exists
CLOUDIFY-2573 remove cloudify storage index on tests startup
CLOUDIFY-2573 flake8
CLOUDIFY-2404 travis debugging
CLOUDIFY-2404 travis reset
Update .travis.yml
Merge pull request #181 from CloudifySource/feature/CLOUDIFY-2402-Expose-blueprint-packaged-files-through-file-server

CLOUDIFY-2402 Added a testenv test for the new plugin get_resource featu...
Merge branch 'develop' into feature/CLOUDIFY-2573-node-state-progress

Conflicts:
	workflows/plugins/testmockoperations/tasks.py
Update responses.py
Update .travis.yml