June 23
Merge branch 'master' of https://github.com/sjackson212/LOTJ3

Conflicts:
	Assets/CharacterMotor.js
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3