Minor updates.
Merge branch 'develop'
Remove "templates".