Turned Week into a singleton and solved review sticking errors
Merge remote-tracking branch 'origin/master'