misc updates again
Merge branch 'dev' of git@github.com:danielkinjerski/GameJame2013_Sept.git into dev

Conflicts:
	GameJam/Assets/NGUI/Examples/Atlases/Refractive/Refractive Atlas.mat
	GameJam/Assets/NGUI/Examples/Atlases/SciFi/SciFi Atlas.mat
	GameJam/Assets/NGUI/Examples/Scenes/Tutorial 8 - Toggle.unity
state machine initial setup