modifications to improve loading experience
Merge remote-tracking branch 'upstream/master'
fix for sharing on facebook