Merge Indev to Master

I think it's about time to merge the Indev repository and allow people to use 1.6.4 for the client. I will test 1.7.2 and chat later.