Merge branch 'hotfix/20131028a' into develop
Merge branch 'master' of https://github.com/hisaotsu/NetworkTool into develop
have some private info.

have some private info.
deleting private info

.
delete private info.
Merge commit 'a64d31aa2d08188781d057bd1cf4d5ce3159ffdd' into develop
Merge branch 'develop'