Many changes to support Oculus Rift
Merge origin