Rethink nailed it. I keep hearing the same point from religious folks about how Atheists also have committed mass murders. But this is so different. Killing in the name of Allah is not same as killing by a person who is an atheist. Is the atheist killing in the name of ...well, atheism?? Is he saying you will not go to nowhere (as oppose to heaven) if you don't follow my nobody (God)?



Let's get back to OP's questions.
What should be the role of religion moving forward?
>Religion shouldn't be a doctrine to strictly follow to. It should be a philosophy. There will be tonnes of people who will continue believing in God no matter what so there's no point going against religion. Just don't let it rule everybody else.

What should it teach, focus, encourage(discourage)?
>It should first teach tolerance. It should allow acceptance of other ideas. It should also not be a cult, but an idea that people should be free to adopt or reject. It should focus on good behavior as oppose to increasing its base.