fix alarm error and nav bar.
update badge layout & alarm
Merge branch 's81375'

* s81375:
  update badge layout & alarm
  fix alarm error and nav bar.

Conflicts:
	wakeup.xcodeproj/project.pbxproj
	wakeup/BadgeViewController.m
fix merge bug.