+ VServ
+ OpenIAB
1
1
1
2
1
Merge branch 'master' into GooglePlay

Conflicts:
	Assets/Plugins/Android/facebook/bin.meta
	Assets/Plugins/Android/facebook/bin/classes.meta
	Assets/Plugins/Android/facebook/bin/classes/com.meta
	Assets/Plugins/Android/facebook/bin/classes/com/facebook.meta
	Assets/Plugins/Android/facebook/bin/classes/com/facebook/android.meta
	Assets/Plugins/Android/facebook/bin/classes/com/facebook/internal.meta
	Assets/Plugins/Android/facebook/bin/classes/com/facebook/model.meta
	Assets/Plugins/Android/facebook/bin/classes/com/facebook/unity.meta
	Assets/Plugins/Android/facebook/bin/classes/com/facebook/widget.meta
	Assets/Plugins/Android/facebook/bin/res.meta
	Assets/Plugins/Android/facebook/bin/res/drawable-hdpi.meta
	Assets/Plugins/Android/facebook/bin/res/drawable-ldpi.meta
	Assets/Plugins/Android/facebook/bin/res/drawable-mdpi.meta
	Assets/Plugins/Android/facebook/bin/res/drawable-xhdpi.meta
	Assets/Plugins/Android/facebook/bin/res/drawable.meta
	Assets/Scenes/Main.unity
	CastleAttack-csharp.sln
	CastleAttack.sln
	CastleAttack.userprefs
* fix text shader with clipping
2
Merge branch 'master' into GooglePlay

Conflicts:
	Assets/Scenes/Main.unity
	CastleAttack-csharp.sln
	CastleAttack.sln
	CastleAttack.userprefs
1
1
1
Merge branch 'GooglePlay'