update admin login
Merge remote-tracking branch 'mannix/master'
merge mannix code feb-15
test billing
Merge remote-tracking branch 'mannix/master'
add preload topfan badges
Merge remote-tracking branch 'mannix/master'
merge mannix code feb-19
merge mannix code feb-19
Merge remote-tracking branch 'stephen/master'