integrating many commits manually from macreey's branch
we are officially moving, adding redirects for website