bug fixes
Merge branch 'unityEdBranch' of https://github.com/dominikkrejcik/smartscarf into unityEdBranch

Conflicts:
	unity/smartscarf/Assets/User.cs
asdf