Merge commit '83aa3d4e1cc20d055fe086768088a138838c0acf' into Devaside

Conflicts:
	src/com/redomar/game/Game.java
Merge commit 'c377219a7ff3edd1716cea80de7c7e71212ec8db' into Devaside

Conflicts:
	src/com/redomar/game/Game.java
Merge commit 'e20e98fc1fb092908bfda9461f7baae60f5feb55' into Devaside
Merge branch 'aside' into Devaside

Conflicts:
	src/com/redomar/game/Game.java
Merge pull request #1 from redomar/Devaside

Updated local multiplayer to master branch