Fix syntax
Merge pull request #464 from btcdrak/patch-3

Fix syntax
Merge pull request #465 from CounterpartyXCP/develop

Develop
Merge remote-tracking branch 'upstream/master'
Update bower dependencies