Merge back from develop3d

Now Available for Windows (TM) Phone (R)(TM)(Patent Pending)