Merge branch 'master' of C:\Workspace\Traktbug with conflicts.
Merge remote-tracking branch 'origin/master'
Minor theme changes
Merge remote-tracking branch 'origin/master'