fgfgfg
Merge branch 'dev-thienvu'

Conflicts:
	History.txt