Commiting irrelevant changes to merge
Merge branch 'Tim' of https://github.com/cstupi/ERApp into Tim

Conflicts:
	Assets/LoginHandler.cs