Making 1.7 Master, manual override

I just made all of the files for 1.7 main the files for master, because
i couldnt figure out how to deal with the merge conflicts, really i just
wanted to make the 1.7-For-Real branch the master branch, so there we go