Merge pull request #1 from xtuple/master

update stack
Merge pull request #2 from xtuple/master

update stack
Merge pull request #3 from xtuple/master

update stack
Incident #19130 - committing what i have so far
Incident #19130 - reworked startup.js into something that might actually work
Incident #19130
Merge pull request #4 from xtuple/master

catching up
merge

ranch '19130' into mergeheadache

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
issue #19224: First pass sync user.
Incident #19130 - removing ds_store files
isse #19224: Refinements to admin.
issue #19224: Always sync user
Merge pull request #32 from jrogelstad/19224

issue #19224: Add support for synchronizing instance user accounts to global user accounts.
Merge pull request #31 from mikerodonnell89/19130

19130
Merge pull request #10 from xtuple/master

catchup.
issue #19314: Add sales properties to item site
Merge pull request #33 from jrogelstad/master

issue #19314: Add sales support to item site.
Merge pull request #1 from xtuple/master

2013-01-30