bug 47
Merge branch 'productive' of https://tuph1011@github.com/wase1012/awp_palaver.git into productive