Room, upload and delete files finished
Room upload and delete files finished


Conflicts:
	protected/runtime/application.log