Merge branch 'master' of http://git.dashgame.com/fenix/battlearray_client

# Conflicts:
#	Assets/Scenes/Battle.unity