Merge pull request #389 from wardi/master

workaround for password reset failure
ATI XLS template heading text update