Metadata upgrade
Merge branch 'master' of https://github.com/kryptosmobile/NSC

Conflicts:
	config.xml
	default-metadata.json