We merged using the git console
Merged more commits
Overrite
fixing trees
Merge branch 'master' of https://github.com/menohack/Vera into JonsBranch

Conflicts:
	Assets/AssetZoo.unity
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/QualitySettings.asset
	Vera.userprefs