foo
Merge branch 'master' of github.com:uralbash/elfinder-pyramid

Conflicts:
	pyramid_elfinder/elFinder.py