Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/test.jpg
	Assets/Resources/test.jpg.meta
	Assets/Scenes/Dev.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/af/afd12ac019b8d2a48ae4480fa76cdb75

Merge branch 'master' of
https://github.com/SelfishGames/Game2

Conflicts:
	Assets/Resources/test.jpg
	Assets/Resources/test.jpg.meta
	Assets/Scenes/Dev.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/af/afd12ac019b8d2a48ae4480fa76cdb75

more
background