Merge branch 'master' of https://github.com/sebafonte/Explorer

Conflicts:
	Source/Interface/pane-principal.lisp
Merge branch 'master' of https://github.com/sebafonte/Explorer