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
add the flurryAnalytics and modify string
merge origin master