remove smarty cache
fix missing } in password template
Merge branch 'master' into tax