mac commit
Merge branch 'master' of https://github.com/kimtaikee/Checklist

Conflicts:
	gen/com/sunrise/checklist/R.java