Merge branch 'master' of github.com:lukax/LOBWebApp

Conflicts:
	README.md