fixed a bug causeing the homepage not to load correctly
Merge remote-tracking branch 'origin/master'