cleanup
Merge branch 'master' of github.com:trustpay/demo_homesafe

Conflicts:
	DEPLOY.txt
	HowTo.txt
	config/deploy.rb