modified:   README.md
	renamed:    SimpleDB/JSONSimpleDB.php -> src/php/SimpleDB/JSONSimpleDB.php
	renamed:    SimpleDB/JSONSimpleDBi.php -> src/php/SimpleDB/JSONSimpleDBi.php
	renamed:    SimpleDB/SimpleDB.php -> src/php/SimpleDB/SimpleDB.php
	renamed:    SimpleDB/SimpleDBi.php -> src/php/SimpleDB/SimpleDBi.php
	renamed:    php/lang/ClassLoader.php -> src/php/lang/ClassLoader.php
	renamed:    RESTful/.htaccess -> src/php/restful/.htaccess
	renamed:    Servlet/Cookie.php -> src/php/servlet/Cookie.php
	renamed:    Servlet/HttpServlet.php -> src/php/servlet/HttpServlet.php
	renamed:    Servlet/HttpServletRequest.php -> src/php/servlet/HttpServletRequest.php
	renamed:    Servlet/HttpServletResponse.php -> src/php/servlet/HttpServletResponse.php
	renamed:    Servlet/HttpSession.php -> src/php/servlet/HttpSession.php
	renamed:    Servlet/RESTfulRequest.php -> src/php/servlet/RESTfulRequest.php
	renamed:    Servlet/RESTfulResponse.php -> src/php/servlet/RESTfulResponse.php
	renamed:    Servlet/RESTfulSession.php -> src/php/servlet/RESTfulSession.php
	renamed:    Servlet/ServletContainer.php -> src/php/servlet/ServletContainer.php
	renamed:    Session.php -> src/php/session/Session.php
Merge branch 'whjsls'

Conflicts:
	RESTful/.htaccess