Fixed the bug where the back button fails to goto homepage.
Merge remote-tracking branch 'origin/master'