Redirect Delete
File Read From System
File Read From System
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/controllers/AdsController.js