TODO note in search.
TODO note in index.
Remove unneeded notes-template
Merge branches 'master' and 'develop'