1.1.1.0
Merge branch 'master' of https://github.com/zerozaki0752/BitcoinTheNightMan

Conflicts:
	cloud/main.js