hot fixed
new commit on rest template
Merge branch 'master' of https://github.com/sokhengsam/opensource into resttemplate

Conflicts:
	test.txt