Add architecture detection for OculusSDK
Merge branch 'master' into CEGUI

Conflicts:
	makefile