Pull from server
Merge branch 'master' of github.com:webnaz/ezfilemanager

Conflicts:
	README.md