Merge branch 'development'
Merge branch 'development'
build client
.gitignore to exclude client/public
changed scroll
Merge branch 'development' of github.com:mycozycloud/cozy-notes into development

Conflicts:
	client/public/javascripts/app.js