Re-factoring code

Dont remember what I did. Some code re-factoring.
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/game/bomberboom/screen/GamePlay.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit d4bffe4d24177daa373ad56a882b5aeb31b4c4e3.
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/game/bomberboom/screen/GamePlay.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 34dba0ef53ed1c9f6adaf00663943ec35129001d.
Lost all my changes

...........
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/game/bomberboom/screen/GamePlay.java