Somethings!!
Merge branch 'develop' into nuttapon_branch

Conflicts:
	nuttapon_test.txt

conflict resolved