issue #19800: moved Preferences to gear menu
issue #19800: preferences not always showing
Merge pull request #661 from shackbarth/19800_140

issue #19800: moved Preferences to gear menu
fix currency conversion bug
Merge pull request #664 from shackbarth/currencyfix

fix currency conversion bug
20979, set correct db default on oauthsso client definition
Merge pull request #673 from xtuple/tags/R1_4_0

keep up with 1.4.0 changes
issue #20864: jsdoc
Merge pull request #672 from jgunderson/20979

20979, set correct db default on oauthsso client definition
REST - Change response to return full object to include etags.
Merge pull request #675 from bendiy/master

REST - Change response to return full object to include etags.
issue #20999: allow relative path of -c flag in build_app
Merge pull request #676 from shackbarth/cflag

issue #20999: allow relative path of -c flag in build_app
Merge pull request #674 from shackbarth/20864

issue #20864: jsdoc
Merge pull request #671 from jrogelstad/20734

issue# 20734: Incremental progress
Discovery Doc getIsRestORMs() should recurse to find grandchildren
Merge pull request #679 from bendiy/master

Discovery Doc getIsRestORMs() should recurse to find grandchildren
Merge remote-tracking branch 'xtuple/master' into 20962
Cleaning up.