list-edit integration
Merge branch 'master' of https://github.com/sions/Birthday-android

Conflicts:
	app/src/com/masa/birthday/BirthdayRecord.java
	app/src/com/masa/birthday/MainActivity.java