hot fix implemented
conflicts fixed

Conflicts:
	src/com/epic/score_app/viewlayer/ViewPlayer.java