merge
Merge branch 'master' of git://github.com/gem-sw/GEMCode
Merge branch 'master' of github.com:gem-sw/GEMCode
Merge branch 'master' of git://github.com/gem-sw/GEMCode
bunch of updtatesÃ
Merge pull request #193 from dildick/master

bunch of updates