Vinilla master page and Teacher dash fix again...
Merge remote-tracking branch 'origin/master'