make sure app_template_url_for is compatible with all the standard url_for's options
Merge branch 'app-template-url-for'