conflict test
solve conflict
Merge branch 'master' of https://github.com/eMFORCE-DEV/sampleExtJs

Conflicts:
	README.md