test~  a little change
Merge branch 'master' of https://github.com/yzheng624/Sirius-Eclipse

Conflicts:
	bin/classes.dex
	bin/classes/com/sirius/MemoListAdapter.class
	src/com/sirius/MemoListAdapter.java