Making some minor fixes...
More minor fixes.
Merge branch 'master' of https://github.com/mauricioco/beatemup_game

Camera and AI branches finally merged. Now we need to implement attacks!

Conflicts:
	app/src/main/java/com/learn/flavio_mauricio/beatemupgame/game/GameView.java
	app/src/main/java/com/learn/flavio_mauricio/beatemupgame/logic/GameMap.java
	app/src/main/java/com/learn/flavio_mauricio/beatemupgame/logic/LogicManager.java