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

Conflicts:
	README

diff --cc README
index 7b44139,68bfd7d..35cf1a7
--- 1/README
--- 2/README
+++ b/README
@@@ -1,5 -1,4 +1,9 @@@
  <<<<<<< 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
 +test edit.
 +edited from clone of official.
++=======
+ edited from github.
++>>>>>>> 6a6e1fef279d3d13450020fca14edbccef4fd7af