index file edited
Merge branch 'develop' of github.com:E-SGKYARDIM/E-SGKYARDIM into develop

Conflicts:
	db/schema.rb