no message
Merge branch 'master' of https://github.com/forfunza/battler

Conflicts:
	Library/assetDatabase3