Changing priorities between rotationQuaternion and rotation when loading/saving
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

Conflicts:
	babylon.1.12-beta.js