Merge branch 'development'
Merge branch 'development'
build client
remove client/public files !
.gitignore to exclude client/public
changed scroll
Merge pull request #19 from aenario/feature/scrollchanges

scroll changes
.gitignore to exclude client/public
changed scroll
synchro with tosch
bold and link integration V1
Merge branch 'feature/bja/editor/bold_link' into development
Merge branch 'development' of github.com:mycozycloud/cozy-notes into development

Conflicts:
	client/public/javascripts/app.js
Merge branch 'development' of github.com:mycozycloud/cozy-notes into development