Updating for latest unity 4
Fixing normal map import settings
Merge branch 'master' of https://github.com/Pillowdrift/StellarSwingClassic

Conflicts:
	.gitignore
	Assets/Textures.meta
	Assets/Textures/GUI.meta
	Assets/Textures/GUI/Scorebar.meta
	Assets/Textures/Ore.meta
	Assets/Textures/Ore/Materials.meta
	Assets/Textures/Ore/Materials/stone.mat.meta