Added hook_theme().
Merge remote-tracking branch 'origin/master'