Merge remote-tracking branch 'origin/master' into test
+ file.doc
* add test file
+ debug_02.php
+ add a.txt