merge
Merge branch 'develop' of github.com:E-SGKYARDIM/E-SGKYARDIM into develop

Conflicts:
	app/views/entries/index.html.haml
	db/schema.rb