BTS-6 : ADD
Merge remote-tracking branch 'origin/BTS-5' into BTS-6

Conflicts:
	source/test1/newfile1.php
Merge pull request #22 from Hyunghu-Kim/BTS-6

Bts 6