Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook

Conflicts:
	README

diff --cc README
index b51bfc4,35cf1a7..0014c0c
--- 1/README
--- 2/README
+++ b/README
@@@ -1,4 -1,9 +1,13 @@@
  <<<<<<< HEAD
  This is the documentation for the Evergreen Open-ILS project. It is maintained by DIG volunteers. For the published documentation, visit: http://docs.evergreen-ils.org
  
+ <<<<<<< HEAD
 +edited from github #2 .
++=======
++<<<<<<< HEAD
+ test edit.
+ edited from clone of official.
+ =======
+ edited from github.
+ >>>>>>> 6a6e1fef279d3d13450020fca14edbccef4fd7af
++>>>>>>> 01f1cae45e26b13819546131fd5a57181e656bbb