tét
Merge branch 'master' of github.com:HaiConvertDigital/17_06_14

Conflicts:
	Task.txt