Ver. 1.15

Ver. 1.15
Merge branch 'master' of https://github.com/Billmate/oscommerce