template-tags.php again :P
Merge branch 'development'