[CB-4347] Fix merge issues in bb10 platform guide
[CB-1863] Fix filetransfer.abort() example having callbacks.
[CB-3816] create command takes time; -d flag
[CB-3816] 'npm update' refreshes cordova , not the app