merge origin master
merge origin master
origin master
merge origin master
origin master
merge origin master
merge origin master
merge origin master
merge origin master
preview png update
image default png
log in&out button png
setting alarm background png
add the flurryAnalytics and modify string
merge origin master
setting alarm button png
I made settings and many tiny things.
setting alarm background png
I fixed settings.
Merge branch 'rfrost'