Alpha version 1.01

Feel good man.
Merge branch 'master' of https://github.com/rpcarrig/memomap.git

Conflicts:
	MemoMapActivity/gen/com/rpcarrig/memomapa/R.java
	MemoMapActivity/src/com/rpcarrig/memomapa/MemoMapActivity.java
	MemoMapActivity/src/com/rpcarrig/memomapa/MemoMapService.java