fix adaptertype bug
remove some comment added for debuging
Merge branch 'develop' into feature/managementFlow
fix missing '
fixed promotion bugs empty string
Merge branch 'develop' of https://github.com/CE-KMITL-OOAD-2014/online_shopping_system into develop
Merge remote-tracking branch 'origin/develop' into feature/managementFlow