Sync'd with 1.0.1
Merge branch 'master' of github.com:snielsen/cfapp_ultralink

Conflicts:
	cloudflare.json