reverted to aa8f3d2bfb0409d3afc48d7c91c7bb7ea78d0e9c
Merge pull request #83 from combats/developTest

reverted to aa8f3d2bfb0409d3afc48d7c91c7bb7ea78d0e9c