meerge
Storage API fixes
Merge branch 'dev-entities' into dev
removed eclipse project file and added some extensions to .gitignore
Merge branch 'dev-pipes' into dev