Deleted unnecessary directory.
Changed database credentials.
Merge remote-tracking branch 'origin/master'

Conflicts:
	proxy-dev.php