Button edits
Merge branch 'master' of https://github.com/rhnoble/oldperson

Conflicts:
	Old Person App/res/layout/notes.xml