before bens 2nd merge
Merge branch 'master' of github.com:greggehrich/sap3-gg