2014/12/21
1. add addAlarmActivity
2. add addCheckActivity
3. add addTicketActivity
Merge branch 'master' of https://github.com/tel3342311/IHearYou

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
Merge branch 'master' of https://github.com/tel3342311/IHearYou

Conflicts:
	app/src/main/AndroidManifest.xml