Merge branch 'hotfix/insecure-random'
Merge branch 'master' of github.com:vialink/viacrypt
Link to http://viacry.pt/
Fixed baseurl from config.js.sample

Conflicts:
	getassets.js
Merge branch 'master' into develop

Conflicts:
	README.md
	config.js.sample