Merge branch 'master' of https://github.com/rockztar/NewRPGAndroidGame

Conflicts:
	gen/com/example/newrpgandroidgame/R.java
S
Merge branch 'master' of https://github.com/rockztar/NewRPGAndroidGame

Conflicts:
	gen/com/example/newrpgandroidgame/R.java