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

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