Merge branch 'master' of https://github.com/sorcerer310/Bsugdx002

Conflicts:
	Gdx002/src/com/bsu/make/ItemFactory.java
	Gdx002/src/com/bsu/make/TipsWindows.java
	Gdx002/src/com/bsu/obj/LevelState.java
	Gdx002/src/com/bsu/screen/GameScreen.java
	Gdx002/src/com/bsu/screen/RoleScreen.java
	Gdx002/src/com/bsu/screen/SelectRoleScreen.java
	Gdx002/src/com/bsu/screen/UpdateScreen.java
Merge branch 'master' of https://github.com/sorcerer310/Bsugdx002

Conflicts:
	Gdx002/src/com/bsu/make/ItemFactory.java
	Gdx002/src/com/bsu/make/TipsWindows.java
	Gdx002/src/com/bsu/obj/LevelState.java
	Gdx002/src/com/bsu/screen/GameScreen.java
	Gdx002/src/com/bsu/screen/RoleScreen.java
	Gdx002/src/com/bsu/screen/SelectRoleScreen.java
	Gdx002/src/com/bsu/screen/UpdateScreen.java