tmp bang changes on home macbook
Merge branch 'master' into freelancer
Fix freelancer finish registration bugs