Merge branch 'develop' into customFields

diff --cc index.php
Simple merge

diff --cc models/admin/contacts/index.php
Simple merge

diff --cc views/admin/contacts/edit.html
index 7ed5787,aea182f..3b6ba83
--- 1/views/admin/contacts/edit.html
--- 2/views/admin/contacts/edit.html
+++ b/views/admin/contacts/edit.html
@@@ -74,10 -74,10 +74,10 @@@
        {/if}
  
        {if $option == 'create'}
 -        <h2 class="glm-left">Add New Contact</h2>
 +        <h2>Add New Contact</h2>
        {else}
          {if $newEmailError != ''}
-         <h2 class="glm-required glm-flash-updated">NOTE: Your new E-Mail address was not valid. Please see below.</h2>                            
+         <h2 class="glm-required glm-flash-updated">NOTE: Your new E-Mail address was not valid. Please see below.</h2>
          {else}
          {if $contactUpdated}<h2 class="glm-notice glm-flash-updated">Contact Updated</h2>{/if}
          {/if}