Merge brancht  'master' of github.com:justcoin/snow

Conflicts:
	margin/package.json
Allow admin to verify bank account manually.
Merge branch 'master' of github.com:justcoin/snow