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

Conflicts:
	README

diff --cc README
index 850b393,fbd6606..01533bb
--- 1/README
--- 2/README
+++ b/README
@@@ -1,3 -1,1 +1,7 @@@
- edited now 
++<<<<<<< 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
 +
++edited now 
++=======
+ This is a test from RS.
++>>>>>>> d4b0a79b9d915d7aa5782b06835a593aa68e0d18