Merge branch 'master' into newui

Conflicts:
	BookReaderIA/inc/BookReader.inc

diff --cc BookReaderIA/inc/BookReader.inc
index 94f6773,f7e1b2e..b949dcb
--- 1/BookReaderIA/inc/BookReader.inc
--- 2/BookReaderIA/inc/BookReader.inc
+++ b/BookReaderIA/inc/BookReader.inc
@@@ -177,8 -150,45 +178,13 @@@ class BookReade
    brConfig["mode"] = 2;
  <? } ?>
  </script>
- <!-- The script included below is dynamically generated JavaScript that includes the book metadata and page image access functions -->
- <script type="text/javascript" src="<? echo($metaURL); ?>"></script>    
+ <!-- The script included below is dynamically generated JavaScript that includes the book metadata and page image access functions.
+      The ia{number}.us.archive.org server referenced below can and does change, so this URL should NOT be used for permanent access.  -->
+ <script type="text/javascript" src="<? echo($metaURL); ?>"></script>
+ <!-- This URL will find the item and redirect to the correct server.  Remove the line above and use the URL below for stable access. -->
+ <!-- <script type="text/javascript" src="<? echo($locateURL); ?>"></script> -->
+ 
 -<? if ($uiMode == 'full') { ?>
 -<div id="BookReaderSearch" style="width:190px; right:0px; top:10px; bottom:2em;">
 -    <form action='javascript:' onsubmit="br.search($('#BookReaderSearchBox').val());">
 -        <p style="display: inline">
 -            <input id="BookReaderSearchBox" type="text" size="20" value="search..." onfocus="if('search...'==this.value)this.value='';" /><input type="submit" value="go" />
 -        </p>
 -    </form>
 -    <div id="BookReaderSearchResults">
 -        Search results
 -    </div>
 -</div>
 -
 -
 -<div id="BRfooter">
 -    <div class="BRlogotype">
 -        <a href="http://archive.org/" class="BRblack">Internet Archive</a>
 -    </div>
 -    <div class="BRnavlinks">
 -        <!-- <a class="BRblack" href="http://openlibrary.org/dev/docs/bookreader">About the Bookreader</a> | -->
 -        <a class="BRblack" href="http://www.archive.org/about/faqs.php#Report_Item">Content Problems</a> |
 -        <a class="BRblack" href="https://bugs.launchpad.net/bookreader/+filebug">Report Bugs</a> |
 -        <a class="BRblack" href="http://www.archive.org/details/texts">Texts Collection</a> |
 -        <a class="BRblack" href="http://www.archive.org/about/contact.php">Contact Us</a>
 -    </div>
 -</div>
 -<? } /* uiMode */ ?>
 -
+ <script type="text/javascript">
 -    // $$$ hack to workaround sizing bug when starting in two-up mode
 -    $(document).ready(function() {
 -        $(window).trigger('resize');
 -    });
 -    
      // Usage stats
      if(window.archive_analytics) { window.archive_analytics.values['bookreader'] = 'open'};
  </script>