hjhk
Merge branch 'master' of https://github.com/AIMP/MappingBooks.git

Conflicts:
	MappingBooks/project.properties
	MappingBooks/src/interface_module/BookViewerActivity.java