update project properties
update bin folder
Merge branch 'battle-system'

Conflicts:
	.actionScriptProperties