main page has done
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