brunched
Merge branch 'master' of github.com:mycozycloud/cozy-home

Conflicts:
	client/public/javascripts/app.js
1.0.2