changes in production
Merge branch 'master' of github.com:mahsa-poorjafari/prepare_project

Conflicts:
	config/database.yml
fixed slider