Merge branch 'master' of github.com:xtuple/xtuple into billing

Conflicts:
	enyo-client/extensions/sample_debug.js
	scripts/install_xtuple.sh
Merge remote-tracking branch 'XTUPLE/master' into 21625b
Merge remote-tracking branch 'XTUPLE/billing' into 21625b
Issue #21625: Fixed translation and extension ordering
Merge branch '21625b' of github.com:lynnaloo/xtuple into lynnaloo-21625b

Conflicts:
	scripts/install_xtuple.sh
Merge branch 'lynnaloo-21625b' into billing