add token
code cleaning
call cozy-monitor with sudo and create file controller.token
create controller.token in install_controller and hide token
merge conflict
change token transmission from haibu to home
start controller without token in development environment
merge conflict
Merge branch 'master' of github.com:poupotte/cozy-setup into feature/authToken
change user haibu-home to cozy-home
Merge branch 'feature/authToken' of github.com:poupotte/cozy-setup

Conflicts:
	fabfile.py