fix
Merge branch 'master' of https://github.com/hmitev/web-based-ide

Conflicts:
	common/FileManager.php