Merge pull request #1693 from tsmrachel/1333742

 [fix bug 1333742] Change Sign In button wording to include registration

Author: akatsoulas

mozillians/jinja2/base.html

@@ -135,9 +135,9 @@
                   {% endif %}
                 {% elif not show_start %}
                   {% set next_url = request.REQUEST.next | default(url('phonebook:login')) %}
-                  <a id="nav-login" title="{{_('Sign in')}}"
+                  <a id="nav-login" title="{{_('Log In / Sign Up')}}"
                      href="{{ nonprefixed_url('oidc_authentication_init') }}?next={{ next_url }}">
-                    <span class="signin button">{{ _('Sign in') }}</span>
+                    <span class="signin button">{{ _('Log In / Sign Up') }}</span>
                   </a>
                 {% endif %}
               </nav>