Map in the gm mode

Changed map to fragment - bug: opening it twice crashes it
Merge remote-tracking branch 'origin/master'

Conflicts:
	Odysseia/app/app.iml
	Odysseia/app/src/main/java/com/ragtag/Odysseia/GameMapFragment.java