modified:   AndroidManifest.xml
	modified:   project.properties
	new file:   res/drawable-hdpi/setting_bg.png
	modified:   res/layout/activity_main.xml
	new file:   res/layout/activity_setting.xml
	new file:   res/layout/time_text.xml
	modified:   res/values/colors.xml
	modified:   src/com/ryanzone/wakeup/activity/MainActivity.java
	new file:   src/com/ryanzone/wakeup/activity/SettingActivity.java
	new file:   src/com/ryanzone/wakeup/adapter/TimeSelectAdapter.java
	new file:   src/com/ryanzone/wakeup/utils/Common.java
	modified:   src/com/ryanzone/wakeup/activity/SettingActivity.java
	modified:   src/com/ryanzone/wakeup/adapter/TimeSelectAdapter.java
	modified:   src/com/ryanzone/wakeup/activity/SettingActivity.java
	modified:   src/com/ryanzone/wakeup/adapter/TimeSelectAdapter.java
	modified:   src/com/ryanzone/wakeup/activity/SettingActivity.java
	modified:   res/layout/activity_setting.xml
	modified:   res/layout/time_text.xml
	modified:   res/values/strings.xml
	modified:   src/com/ryanzone/wakeup/activity/SettingActivity.java
	res/drawable-hdpi/back_nor.png
	res/drawable-hdpi/back_press.png
	res/drawable-hdpi/confirm_nor.png
	res/drawable-hdpi/confirm_press.png
	res/drawable-hdpi/music_choice_nor.png
	res/drawable-hdpi/music_choice_press.png
	res/drawable-hdpi/shake_strengh_nor.png
	res/drawable-hdpi/shake_strengh_press.png
	res/drawable-hdpi/title_line.png
	res/drawable/
	res/layout/gv_list_item_week.xml
	res/layout/setting_top.xml
	modified:   AndroidManifest.xml
	modified:   res/layout/activity_setting.xml
	modified:   res/layout/time_text.xml
	modified:   res/values/colors.xml
	modified:   res/values/dimens.xml
	modified:   res/values/styles.xml
	modified:   src/com/ryanzone/wakeup/activity/SettingActivity.java
	modified:   src/com/ryanzone/wakeup/adapter/TimeSelectAdapter.java
	assets/
	res/anim/
	res/drawable-hdpi/back_nor.png
	res/drawable-hdpi/back_press.png
	res/drawable-hdpi/confirm_nor.png
	res/drawable-hdpi/confirm_press.png
	res/drawable-hdpi/music_choice_nor.png
	res/drawable-hdpi/music_choice_press.png
	res/drawable-hdpi/shake_strengh_nor.png
	res/drawable-hdpi/shake_strengh_press.png
	res/drawable-hdpi/title_line.png
	res/drawable/
	res/layout/gv_list_item_week.xml
	res/layout/ppw_music_choice.xml
	res/layout/setting_top.xml
Merge branch 'dev' of github.com:tangren03/wakeup-android into dev

Conflicts:
	res/layout/activity_main.xml
	src/com/ryanzone/wakeup/activity/MainActivity.java

	new file:   assets/robotothin.ttf
	new file:   assets/time_font.otf
	new file:   res/anim/bottom_menu_in.xml
	new file:   res/anim/bottom_menu_out.xml
	new file:   res/drawable-hdpi/back_nor.png
	new file:   res/drawable-hdpi/back_press.png
	modified:   res/drawable-hdpi/bg_splash_botton.png
	new file:   res/drawable-hdpi/btn_add_new.png
	modified:   res/drawable-hdpi/clock.png
	new file:   res/drawable-hdpi/confirm_nor.png
	new file:   res/drawable-hdpi/confirm_press.png
Merge pull request #6 from walker02/dev

Dev