Build #43:   Merge branch 'parent-bitcore' into dev-1 Conflicts: bower.json package.json on branch dev-1 about 10 years ago