R
Merge branch 'master' of https://github.com/HydroSurge/KopsControl

Conflicts:
	Assets/Assets_Jaime/scripts.meta
	Assets/Assets_Kuba/Models.meta
	ProjectSettings/ProjectSettings.asset
Merge branch 'master' of https://github.com/HydroSurge/KopsControl