including still more omitted files

probably
Merge branch 'proj' of https://github.com/rpcarrig/memomap.git into proj

Conflicts:
	MemoMapActivity/bin/classes.dex
	MemoMapActivity/bin/classes/com/rpcarrig/memomapa/DataHandler.class
	MemoMapActivity/bin/classes/com/rpcarrig/memomapa/MemoMapActivity.class
	MemoMapActivity/bin/classes/com/rpcarrig/memomapa/MemoMapService.class
	MemoMapActivity/bin/resources.ap_