fixed config Merge branch 'master' of github.com:NatalyMac/InterPhotoNew
fixed config
Merge branch 'master' of github.com:NatalyMac/InterPhotoNew

Conflicts:
	config/web.php

NatalyMac/InterPhotoNew,NatalyMac/InterPhotoNew,NatalyMac/InterPhotoNew