Merge origin/master

Conflicts:
	.gitignore
	web/hakkimizda/bizkimiz.jsp
	web/hakkimizda/neleryaptik.jsp
	web/iletisim/harita.jsp
	web/iletisim/telefonlar.jsp
	web/index.jsp
	web/login.jsp
	web/login_control.jsp
Merge origin/master

Conflicts:
	.gitignore
	web/hakkimizda/bizkimiz.jsp
	web/hakkimizda/neleryaptik.jsp
	web/iletisim/harita.jsp
	web/iletisim/telefonlar.jsp
	web/index.jsp
	web/login.jsp
	web/login_control.jsp