Religion is fixed, based on beliefs and morals, and doesn't change. The only differences are the flavours.
Spirituality is the celebration of ourselves as energetic beings in a physical body in a physical world. There are religions that completely discount spirituality, and there are spiritual beliefs that ignore religion. It could possibly be merged with the Magic and Mysticism or philosophy and religion... It encompasses both.