Integrate 2 versions

Now iPhone and non-iphone automatically redirects.