Push
Commit
Revert "Commit"

This reverts commit 3b91d23e6a5d939614d180207c494f010c3ca773.
Revert "Push"

This reverts commit c56e4aee01ee530df6bb2bc5b5db6dc5454846e5.
Revert "Commit"

This reverts commit 3b91d23e6a5d939614d180207c494f010c3ca773.

Conflicts:
	src/mnr/newrpg/androidgame/Character.java
Merge branch 'master' of https://github.com/rockztar/NewRPGAndroidGame