update
Merge branch 'master' of https://github.com/yj354/fameup

Conflicts:
	FameUp/bin/classes/io/yuji/fameup/AlarmListActivity.class
	FameUp/bin/classes/io/yuji/fameup/R$attr.class
	FameUp/bin/classes/io/yuji/fameup/R$dimen.class
	FameUp/bin/classes/io/yuji/fameup/R$drawable.class
	FameUp/bin/classes/io/yuji/fameup/R$id.class
	FameUp/bin/classes/io/yuji/fameup/R$layout.class
	FameUp/bin/classes/io/yuji/fameup/R$menu.class
	FameUp/bin/classes/io/yuji/fameup/R$string.class
	FameUp/bin/classes/io/yuji/fameup/R$style.class
	FameUp/bin/classes/io/yuji/fameup/R.class
	FameUp/gen/io/yuji/fameup/R.java