Merge branch 'detox' of github.com:mwaylabs/Espresso into detox
updated TMP to 1.3.0 master
Merge branch 'detox'
Merge branch 'detox'
Merge branch 'detox'
Merge branch 'master' of github.com:mwaylabs/Espresso
updated refs of apache cordova git
Merge branch 'detox'

Conflicts:
	.gitmodules
updated changelog
 remove deprecated method util.pump() and use readableStream.pipe() instead
print success message at the right time
Fixed deprecated path.existsSync to fs.existsSync
Merge pull request #113 from stefanbuck/master

Removed calls to deprecated node API
Merge branch 'master' into detox