* fix text shader bug
1
Merge branch 'master' into GooglePlay

Conflicts:
	Assets/Scenes/Main.unity
	CastleAttack-csharp.sln
	CastleAttack.sln
	CastleAttack.userprefs