Upgrading installed version
Merge branch 'master' of github.com:hostmaster/ansible-btsync

Conflicts:
	handlers/main.yml
	tasks/main.yml
merge
merge conflicts