Added BaseUrl
Merge origin/master

Conflicts:
	templates/folderTree.mustache