corrects menu + javelin
integrates oculus rift
oculus conflicts fix
pre merge
Merge branch 'oculus'

Conflicts:
	Assets/Scripts/FPSInputController.js