extjs in .gitignore
Merge branch 'master' of https://github.com/MarkoZ/SerbiaERP

Conflicts:
	README.md