fix for BUGHUNTS4WEBBASEDARENA-33, BUGHUNTS4WEBBASEDARENA-24 and BUGHUNTS4WEBBASEDARENA-31
fix BUGHUNTS4WEBBASEDARENA-23
Merge pull request #13 from zitang/master

fix for BUGHUNTS4WEBBASEDARENA-33, BUGHUNTS4WEBBASEDARENA-24 and BUGHUNT...