comments email integration
bugfixes
File window upgrade
template search corrections, bcrypt
Merge branch 'devel'