house keeping
Merge branch 'master' of https://github.com/neolode/coffer_damn

Conflicts:
	.gitignore
	Assets/Scripts/Camera/FOV.cs
	Library/AssetImportState
	Library/assetDatabase3
...