Merge branch 'xtuple' into dev-1-3-6

Conflicts:
	RELEASE.md

diff --cc RELEASE.md
index 4af8fe8,caab0bb..b7ea46c
--- 1/RELEASE.md
--- 2/RELEASE.md
+++ b/RELEASE.md
@@@ -1,14 -1,12 +1,13 @@@
- 1.3.6 (2013/06/06)
- =======
- <<<<<<< HEAD
- 1.3.6 (2013/05)
- >>>>>>> dev-1-3-6
- ===============
 +<<<<<<< HEAD
+ 1.3.7 (2013/06/11)
+ ==================
  
- Critical deployment changes
- ---------------------------
- * Fix critical user login problem
+ Features and bugs
+ ----------------
+ * Fix problem where user names that are email addresses could not log in.
+ 
+ 1.3.6 (2013/06/06)
+ ==================
  
  Features and bugs
  ----------------

diff --cc docs/UBUNTU_SETUP.md
Simple merge

diff --cc package.json
Simple merge