Refs #61
Refs #61
Refs #61
Merge branch '61_multijson_config'

Conflicts:
	config.template.json
	lib/richwallet/server/config.js
	public/manifest.appcache