no message
Merge branch 'master' of https://github.com/DrunkReaperMatt/PCQ-Conjure-Omega

Conflicts:
	Assets/NGUI/Examples/Animations/Button.anim.meta
	Assets/NGUI/Examples/Animations/Checkmark.anim.meta
	Assets/NGUI/Examples/Animations/Logo.anim.meta
	Assets/NGUI/Examples/Animations/Window - Back.anim.meta
	Assets/NGUI/Examples/Animations/Window - Forward.anim.meta
	Assets/NGUI/Examples/Atlases/Fantasy/Fantasy Atlas.mat.meta
	Assets/NGUI/Examples/Atlases/Fantasy/Fantasy Atlas.prefab.meta
	Assets/NGUI/Examples/Atlases/Fantasy/Fantasy Font - Normal.prefab.meta
	Assets/NGUI/Examples/Atlases/Refractive/Refractive Atlas.mat.meta
	Assets/NGUI/Examples/Atlases/Refractive/Refractive Atlas.prefab.meta
	Assets/NGUI/Examples/Atlases/Refractive/Refractive Font - Header.prefab.meta
	Assets/NGUI/Examples/Atlases/Refractive/Refractive Font - Normal.prefab.meta
	Assets/NGUI/Examples/Atlases/SciFi/SciFi Atlas.mat.meta
	Assets/NGUI/Examples/Atlases/SciFi/SciFi Atlas.prefab.meta
	Assets/NGUI/Examples/Atlases/SciFi/SciFi Font - Header.prefab.meta
	Assets/NGUI/Examples/Atlases/SciFi/SciFi Font - Normal.prefab.meta
	Assets/NGUI/Examples/Atlases/Wooden/Arimo14.prefab.meta
	Assets/NGUI/Examples/Atlases/Wooden/Arimo18.prefab.meta
	Assets/NGUI/Examples/Atlases/Wooden/Arimo20.prefab.meta
	Assets/NGUI/Examples/Atlases/Wooden/Wooden Atlas.mat.meta
	Assets/NGUI/Examples/Atlases/Wooden/Wooden Atlas.prefab.meta
	Assets/NGUI/Examples/Materials/Backdrop.mat.meta
	Assets/NGUI/Examples/Materials/brick.mat.meta
	Assets/NGUI/Examples/Materials/burlap.mat.meta
	Assets/NGUI/Examples/Materials/sand.mat.meta
	Assets/NGUI/Examples/Models/Orc Armor/Orc Armor.mat.meta
	Assets/NGUI/Examples/Models/Orc Armor/Orc Bracers.prefab.meta
	Assets/NGUI/Examples/Models/Orc Armor/Orc Shoulders.prefab.meta
	Assets/NGUI/Examples/Models/Orc/Orc Skin.mat.meta
	Assets/NGUI/Examples/Models/Orc/Orc.prefab.meta
	Assets/NGUI/Examples/Other/Localization.prefab.meta
	Assets/NGUI/Examples/Other/Storage Icon Template.prefab.meta