Not sure what changed here
Merge branch 'master' of https://github.com/Smartillery/smartillery-client

Conflicts:
	Assets/Scenes/Game.unity