Merge branch 'v4.0' of https://github.com/IBM-Blockchain/marbles into…

… v4.0

added faq

update config file readme with connection profile format

added npm shrinkwrap

upgrade jade to pug

update tutorial to match code

better logs

add log warning about using default creds file

smaller photos

added back the block panel