Integrate module 6
Merge branch 'master' of https://github.com/AIMP/MappingBooks.git

Conflicts:
	MappingBooks/src/maps_module/MapManager.java