Tweaks for version 4.
Merge branch 'master' of https://github.com/jmavis/UCSC_Echo_FAB

Conflicts:
	memory/src/com/childishideas/echo/activities/MainScreenActivity.java