bringing master up-to-date
Merge branch 'KTSSTG'
Merge pull request #68 from ray515/DEVRAY

search form align bug fix
Merge branch 'master' of https://github.com/ktsweb1/magento into KTSDEV
Merge branch 'master' into KTSDEV
updates and merge prep

Merge branch 'KTSDEV' of https://github.com/ktsWeb/magento into KTSDEV