MainSite

** ALL new pull requests should be opened on test branch from now on so master branch remains clean and only necessary changes are merged there. (# NO REVERTING ON MASTER BRANCH)