Merge branch 'hotfix-1.1.13' into develop
make toast layout and add function which call customized toast
recoomendation page check promotion news
promotion toast pops up base on server schedule
resize promotion image
Merge branch 'f_promotion_toast' into develop
resolve network communication conflict from two branch
upgrade version
correct removed start to be visible again.
change user guide page indexer and images
make the Review class implementing Serializable because ClassDetailInfo class containing Review class is passed through interprocess
Merge branch '2.0' into develop
correct duration time in class detail page
add notice xml into detail activity
create front page xml for admin
split loginAndSignup page as two pages with front page
Merge branch 'f_admin_isolation' into develop
Merge branch '2.0' into develop
update gradle build
Merge branch 'release-2.2'